| commit | 37ca54d2a212cd4c1cb4ebf7d3a6cabb1748fe7b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 06:26:56 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 06:26:56 2012 -0800 |
| tree | 4028d13ba562b02f9574d5f55ee764b04e7a95c0 | |
| parent | 0a5b159698c94b718e6fd7395fb511b3476899d0 [diff] | |
| parent | 62ea063df0c96ff549e1fe6d4bbdbf4836f23d3d [diff] |
am 62ea063d: am 7cb8e4ae: Reconcile with jb-mr1-release - do not merge * commit '62ea063df0c96ff549e1fe6d4bbdbf4836f23d3d':