OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:16:54 +0000 (12:16 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:16:54 +0000 (12:16 -0800)
commit78b012f5bc05706d1ce412811ccfaa9385dae0ab
tree48362f445e0d1ad7c0e2fa3b7c3d1cdeb2fcfee7
parent1c6833afd6cfdbc6c696ed0719ceedc37ec0b534
parent1b59ac59bb1c1f28bd40b09cd0995db873e25692
parentf5037ad1ebb04e99622af5e99aeac0c1b44090b7
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Idf4c25115d89397ba668fc290344b2e7c1ea1993