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