| commit | 73ab2652a78ed83ff30a0ea7ccb509418349b61e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 03 11:36:39 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 03 11:36:39 2012 -0800 |
| tree | 1f2f7a014dc6e4552bdce04acf6a56b47565d5ea | |
| parent | 4167988cdbb7c7c225e8edc0e47c9560bb2c2c8d [diff] | |
| parent | 98b6d04739521edc2d0ffe02a41eaf074e3e1fa5 [diff] |
am 98b6d047: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '98b6d04739521edc2d0ffe02a41eaf074e3e1fa5':