| commit | b602f7b14743866e9edff4849cdc8047b1b0710b | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Tue Jun 10 18:41:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 10 18:41:52 2014 +0000 |
| tree | 634e2e4c8d705d73b0a4dff47155fada605f6307 | |
| parent | 19f69337245afb4d14d66ae26fba872c5f9720e8 [diff] | |
| parent | 5c2225c592da49855dbc665edb9f03c18deddb78 [diff] |
am 5c2225c5: am 7976b2be: resolved conflicts for merge of 0e23c5e3 to klp-modular-dev * commit '5c2225c592da49855dbc665edb9f03c18deddb78': MR2.1 - Version 4.4.4. Here we go! DO NOT MERGE