| commit | b97f4382aba5727f664d92ff73c4b28858fb63eb | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 08:08:11 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 11 08:08:11 2012 -0700 |
| tree | 4cce1ee701e5656d94ba62d36862ab3c591fc350 | |
| parent | af05ad5bb693432c5412af7a7f8d330ccc513965 [diff] | |
| parent | cf8f3b2426c788bb5d83e11bee74e128e9c37309 [diff] |
am cf8f3b24: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'cf8f3b2426c788bb5d83e11bee74e128e9c37309':