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:41 +0000 (09:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Oct 2012 16:44:41 +0000 (09:44 -0700)
commitdc9c3a4f2bdd2825e396cb01eafb06122ceea257
treeb48b0cebb89bb33fea47fc25da4184833ba46f68
parent43bd832d128726334de622d67aaac09051c07941
parent2de86a4e1b6ab21f24d9bb269d1e1ad862d7758e
parenta4927aea774d4d4f792560e39ee0f3f2a4d5e9ef
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I9b2354f718f8e792bd040b7fb92f8fd1c77c037a