commit | 73883ea5a62c99090b80967dee9bcbe8855c6481 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Oct 15 07:43:18 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 15 07:43:18 2012 -0700 |
tree | 43610f1c7b55d3087eef3615f110d0ae616439c2 | |
parent | 47be125eca98c2a3802395d8b86234511a383fd6 [diff] | |
parent | f5672feccfc4b3be0ddecc092b949710dec47bba [diff] |
am f5672fec: (-s ours) Reconcile with jb-mr1-factory-release - do not merge * commit 'f5672feccfc4b3be0ddecc092b949710dec47bba':