| commit | 23042bab4399842870b2998ac7e889538b9ba4b9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 26 10:08:03 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 26 10:08:03 2012 -0700 |
| tree | 6497b7b4f7f967065f49b19988aa145a39db5690 | |
| parent | a638642f44e1f475beb591a0aa9fbf4b11dde159 [diff] | |
| parent | db2b9d052b3ebab73695af9335d649340cb8d193 [diff] |
am db2b9d05: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'db2b9d052b3ebab73695af9335d649340cb8d193':