am 5c2225c5: am 7976b2be: resolved conflicts for merge of 0e23c5e3 to klp-modular-dev

Browse Source

* commit '5c2225c592da49855dbc665edb9f03c18deddb78':
  MR2.1 - Version 4.4.4.  Here we go!  DO NOT MERGE

...

This commit is contained in:

Bart Sears 2014-06-10 18:41:52 +00:00 committed by Android Git Automerger

parent 19f6933724 5c2225c592

commit b602f7b147

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available