commit | 626eb453cab7d19ebf9b8e536e0c0da6cc64e4cf | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 10 15:19:15 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 10 15:19:15 2012 -0800 |
tree | 6568ce3f980efa2bee35092eaf880fe62bf52329 | |
parent | 312038af92df10fb8787852fa73b66d5c2e31f7f [diff] | |
parent | 80998ee71f0650b40d8d0a5c23f29723ebd24838 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: Icabdf5fba2bdced2fbb6855e237b875f35ea0475