| commit | 875443d4b56226cf7f4f5155f4c4b6f8293f6f57 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 14:28:19 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 14:28:19 2012 -0800 |
| tree | e1478b6176e8438b5333ae7fc6cdd121b8921c6c | |
| parent | e76962d8d3e84ed2f1593d341d294aa20e824f3b [diff] | |
| parent | 0ee5858203a93d39db3e929a9c5cbe77f92c8412 [diff] |
am 0ee58582: am afac6c90: Reconcile with jb-mr1-release - do not merge * commit '0ee5858203a93d39db3e929a9c5cbe77f92c8412': JOP40E