| commit | 310bc879f95291339f1efe34ddc8f7fa2ba8fdf9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 06 09:11:31 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 06 09:11:31 2012 -0700 |
| tree | 22e30d709114c6aaeb2c60f98ff1610d5b11a5cb | |
| parent | 7002083f083d1139a30ac530ce8b914e6c5e91ef [diff] | |
| parent | 51535bf8ad7d950e05df7c16e4e6a35effc29e83 [diff] |
am 51535bf8: (-s ours) Reconcile with jb-release - do not merge * commit '51535bf8ad7d950e05df7c16e4e6a35effc29e83':