| commit | fa15d3acb0861b682d07dd9bb81d6a44a19cc23b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 06 09:16:21 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 06 09:16:21 2012 -0700 |
| tree | 5a6910f2de42e0d78c005c62b2490f3d2663648e | |
| parent | a6eba6c86dedcd6134a54efa8f6761b336383f31 [diff] | |
| parent | 446cc5b6d887a3ea902f0e883158bec5c8c09462 [diff] |
am 446cc5b6: (-s ours) am 83e3842f: am 7908a68e: (-s ours) Reconcile with jb-release - do not merge * commit '446cc5b6d887a3ea902f0e883158bec5c8c09462':