commit | 48c04a2712167e07d12316b042695988d6eccaf3 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 08:54:28 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 08:54:28 2012 -0800 |
tree | a02e446d0b19fb3c9525d860bc6504030efdb4e0 | |
parent | b8f3c0e45424784e27985f53c54ef353fe9f51d3 [diff] | |
parent | 883b7662e07a8fed678f326ef79c481aba1a1949 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ifba742d6ead562601f4e93d1d526b5efe396066f