| commit | c59703111ee9e7451150a2d5190220398193da40 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 10 09:47:53 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 10 09:47:53 2012 -0700 |
| tree | e8d47313ba5e92e5519cec571eeab5530062693d | |
| parent | b01ba8ff3cceee0f6573f18e5d1cd9535069c395 [diff] | |
| parent | 3ac9bd7eb423a46e9d5cc58f09b5f7dbe91a2f1b [diff] |
am 6c839563: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '6c8395633d4ed9f88888e6df0ae2f33fd8401fd0':