commit | d9b11c3a7bdffa02bf7e2bd84f291c9c7418c884 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:27:09 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:27:09 2012 -0800 |
tree | 53cfab5dd8ce23d9bb07c28c674360466c217908 | |
parent | 3522330d404640c59a3843f88ed56bc95d86750c [diff] | |
parent | cc86adcb3d78a64aed159facb1ad74d0e90310d3 [diff] |
am cc86adcb: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'cc86adcb3d78a64aed159facb1ad74d0e90310d3':