OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Dec 2012 15:34:17 +0000 (07:34 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Dec 2012 15:34:17 +0000 (07:34 -0800)
commit7f5a3d10f860ee1962c4bb81fa5a552cc5fedc3e
tree86061bd233603151ce4e09709bcf29bc01050a36
parent5c806da40c1c3af53d5a777512b67bdb24bb690c
parent4d2a01d3a38b468f68f486a108d26429d7a93465
Reconcile with jb-mr1.1-release - do not merge

Change-Id: Ia5cf13610d470a518ce526f8a46cb6241a28d124