OSDN Git Service

Reconcile with jb-mr1-factory-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:40:50 +0000 (07:40 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:40:50 +0000 (07:40 -0700)
commitf5672feccfc4b3be0ddecc092b949710dec47bba
tree43610f1c7b55d3087eef3615f110d0ae616439c2
parente666ccd6ab00d689819b537e51ab9b965f8a433a
parentd5c3000903dd3e1fd02330d2d3457736ad18d63f
Reconcile with jb-mr1-factory-release - do not merge

Change-Id: I5edb3257bf8f06c3274051af0c4da369d8643ca0