| commit | 5becf6ccf888400e72a9404e5e50a17ba75bac2b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:34:11 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:34:11 2012 -0800 |
| tree | 183ba2477a3a95ad8adbef5a4437a238ece80828 | |
| parent | 874e0edc8875776588dd42dca29cdb0a10b76eb0 [diff] | |
| parent | 1e6561ddfc941d51592a4285c8fe2d054ed29f02 [diff] |
am 1e6561dd: (-s ours) am 17f1fe1a: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '1e6561ddfc941d51592a4285c8fe2d054ed29f02':