OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Oct 2012 16:44:59 +0000 (09:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Oct 2012 16:44:59 +0000 (09:44 -0700)
commitf97af999b91122116b953d1f06b48c00e18a4531
tree5c3172b9b68cf16afc245fb5e5d8cbfb9587e514
parent44ecdf72686fdff76e6f1d76a12f734631f45d2c
parent4ba4655ec32f17298d3c6e43640a44dca344b921
parent41ef60e3654fbd86978b0219e52f4997d56689a2
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ib081b6a0369bd5a597e53ee3a5551f5a63b67939