| commit | 75c92440699d9b1a1c43a568c4ebb08485052ee3 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Sep 24 10:13:04 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 24 10:13:04 2012 -0700 |
| tree | 7db943bed4d8faa6631d6921ca7f9f0ece2910e4 | |
| parent | 90bbdd2e1b7d047e889a646beb6a73368c2ea348 [diff] | |
| parent | 6045fb06c5c8304a1ac9f3388d17a6009794e7d0 [diff] |
am 6045fb06: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '6045fb06c5c8304a1ac9f3388d17a6009794e7d0':