| commit | ac0e5a2631a53c4881fa22b2b42fbc7b02c25d68 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 15 08:27:29 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 15 08:27:29 2012 -0700 |
| tree | 4ea20121e7b35e75a1b915043d7b753a4c7bbfee | |
| parent | de0e417468b7444d07600a1cd0390ceeac67213e [diff] | |
| parent | d792d355f3828eac7005200395f87e4998ff2adf [diff] |
am d792d355: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'd792d355f3828eac7005200395f87e4998ff2adf': JOO46 JOO45C JOO45B JOO45 JOO44B JOO44 JOO40D JOO40C