| commit | 0ddbc6c215c34f708fcc898be25ddffc18282881 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Jan 31 12:33:12 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 31 12:33:12 2014 +0000 |
| tree | 565dfac6b18d7398615b0844a7adb060b5649802 | |
| parent | 1fee45f1af82d9dbb2e709413f020b2291205640 [diff] | |
| parent | c1375f6991a79781899fda3c3f9d471654562d3d [diff] |
Merge "resolved conflicts for merge of 084209e2 to klp-modular-dev-plus-aosp" into klp-modular-dev-plus-aosp