| commit | fe32a4e7d921ec15d8486db69559ed11fd13664d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 04 07:48:11 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 04 07:48:11 2012 -0700 |
| tree | feb0739e56aa53876fd09640059058a07c3f7dba | |
| parent | 180f901b6ceab0e46650121fd83a6992ca81a4f6 [diff] | |
| parent | 124f89fdaaf987dc55e332723f10f4ae69322006 [diff] |
am 124f89fd: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '124f89fdaaf987dc55e332723f10f4ae69322006': JOP04 JOP03B