| commit | dca488897f8ea9f66c81f89f0ab06c2883798c2a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Oct 15 07:40:18 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 15 07:40:18 2012 -0700 |
| tree | 3069ee32839353835f2d6431611022ab68a2b23e | |
| parent | 71bf084189b018d937eb6c1ee7e6d08a27f5c53c [diff] | |
| parent | d32a73105b23fecf3c9b6dcb2321713909bd85fd [diff] |
am d32a7310: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'd32a73105b23fecf3c9b6dcb2321713909bd85fd':