commit | 9ffb1ac31803bc29a06048edc5337a4431f5111d | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:31:15 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:31:15 2012 -0800 |
tree | 0ffa5ba512ec22b2af06a69524d0bf089b3074ae | |
parent | cda1948e611d7c3755902bc733f076f54a19e069 [diff] | |
parent | b1596afa59c7108cc6ce23bab54a1bc41961806a [diff] |
am b1596afa: (-s ours) am b7afc4e1: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'b1596afa59c7108cc6ce23bab54a1bc41961806a':