| commit | 536514522f264e752d131e1afa9b254dc941a0dd | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 14:52:47 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 14:52:47 2012 -0700 |
| tree | 50277a407a947a09980d6fb497dc5b27b88597e2 | |
| parent | 518b45dd19ea04fab798d19f1581dfd4d60e2f15 [diff] | |
| parent | d3ccfd53fe5c0bb4138b22acb818d567a4ca2466 [diff] |
am d3ccfd53: am 5759dead: am a6c77d92: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge * commit 'd3ccfd53fe5c0bb4138b22acb818d567a4ca2466': JZO54K JRO03X