| commit | a66bcb1ed5475dd10439bba50453975f65af2c26 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:31:24 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:31:24 2012 -0800 |
| tree | 3d887ff66b4c8f812a24e4eff30692daae85664c | |
| parent | 07cc2418578a88c0f865813e2455e902c9e7c8da [diff] | |
| parent | b9196f463411ec442b4f8b0d32e03b8c6e537748 [diff] |
am b9196f46: (-s ours) am 95b4c36e: am 48cc6fce: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'b9196f463411ec442b4f8b0d32e03b8c6e537748':