| commit | 863a7b7a7f9d34c237f7ab60b6b8eaa66b1259ee | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 01 07:54:44 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 01 07:54:44 2012 -0700 |
| tree | cc82ca9195c765c0fc322cb4d29e279091236c5e | |
| parent | d8a71417484ed7d937ef612d6499704d0c325874 [diff] | |
| parent | 05caa74872df1258bbf4473fe6d222a9487fe051 [diff] |
am 8603c8ce: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '8603c8ce359a8c69f83305aff3fe5fa26fe4ca0a':