| commit | 963a513ae15ebf9c7abcce70cc8d52703841b6e5 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 14:51:07 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 31 14:51:07 2012 -0700 |
| tree | 50e18099a6e5cf9562f535de599d9b0e8316db66 | |
| parent | 0847955a820cea4f41164f69118f3c1f19072c1d [diff] | |
| parent | dccf2260c8edda887454d40f61f06e72d5389139 [diff] |
am dccf2260: (-s ours) Reconcile with jb-mr0-release - do not merge * commit 'dccf2260c8edda887454d40f61f06e72d5389139':