| commit | 2a5f755a794b2ce4d4027804bcb1af6ece714933 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 14:49:13 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 31 14:49:13 2012 -0700 |
| tree | cd14ec94f2dc16feac7aa5cf7546dfe45a72a33b | |
| parent | ff8d3674abc99c0c45543ade969aec803a71177a [diff] | |
| parent | 8665eb732364b31506719dcce99237e13cc87866 [diff] |
am 8665eb73: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge * commit '8665eb732364b31506719dcce99237e13cc87866': JZO31 JRO03N JRO03M