| commit | 3ce9397e9f0df566c30fd7fd6fe420846dac1911 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:24:44 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 09:24:44 2012 -0700 |
| tree | 0f6eece1a49f3ce0ba4c0c01b64d59587f937d9f | |
| parent | 06168ce4b426434d6b9e9842cdd9bed2d2f2fb4f [diff] | |
| parent | d170e491f53ac61debd687c6145783aa920320fd [diff] |
am d170e491: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'd170e491f53ac61debd687c6145783aa920320fd':