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:17:05 +0000 (12:17 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:17:05 +0000 (12:17 -0800)
commit55e7bdc772047fe6232b51c2900e82eb354dafe5
treed13943957db194bda9f924c325acde9bd2fd81f0
parent0f4d5df5d815466398dba5f2d07aa98f18c35aaa
parent66652870e2fabe2789190b6f455a711c15447a30
parent469f6212b3ce2f73eabed6cd6c7ed95b5b039f07
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I72634b08506c4fed29edd474553cb416dce9cc8e