| commit | 74cddad9dfe6777a4ae047e070cf42ff6f0ace81 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 27 15:13:21 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 27 15:13:21 2012 -0700 |
| tree | bf7440cb97edf73323829eb6c520e0b609bab34a | |
| parent | 121d1955f72918b2ad0b70f2e437252c268381fd [diff] | |
| parent | 0c8806a484d6d78099d9af2782b76f495e4b3c05 [diff] |
am 0c8806a4: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '0c8806a484d6d78099d9af2782b76f495e4b3c05':