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