| commit | 2aebf3d47d18be409d161b96819b62d131246ce9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 12 16:59:09 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 12 16:59:09 2012 -0700 |
| tree | c609fc1b31a3d6a5503acde055eaa093ac73c77d | |
| parent | d832567908a9967d1aa35a24b43e541356728d07 [diff] | |
| parent | b6f137c7d8539dd0cf837a25acb097b33d306c87 [diff] |
am b6f137c7: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'b6f137c7d8539dd0cf837a25acb097b33d306c87':