| commit | 770dd86a758807fc656ff07c4696a273c2283d8f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:31:12 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:31:12 2012 -0800 |
| tree | 817f745f708fee6cf24ef68e8f183872427531a0 | |
| parent | d249cddca6408c5fe2b02c1bbf094f050c5fda57 [diff] | |
| parent | 63766a89a18e8476f6e4cbac505a2a827d0490ab [diff] |
am 63766a89: (-s ours) am b64246ae: am c8e3a27b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '63766a89a18e8476f6e4cbac505a2a827d0490ab':