| commit | 2a00d1fa9948603d5283fed3152291dab1adcb59 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon May 20 08:22:40 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 20 08:22:40 2013 -0700 |
| tree | 3b76d5e38e37ca9f59c689bfb6aef11a75a35249 | |
| parent | 308bcaa44e578279e61be32b572fdb0b11b1e4c7 [diff] | |
| parent | d76306343048d1e16ba92e9eb8f024ad5dfe769d [diff] |
am d7630634: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'd76306343048d1e16ba92e9eb8f024ad5dfe769d':