OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:40:11 +0000 (07:40 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:40:11 +0000 (07:40 -0700)
commit2ee4be8d3a8eb3355207d2549a7cd4ff6e0677ae
tree16fc3c0135facf1a0d890fc1fe5e122505be4029
parentd294cac5d83eb18dea9b2f84d4202b13f3ea3c43
parenteabb31b088b0083833eef77cf2e236f8f6124ef0
parent0c762a978ecd4c6145484bc68627cb8fd9c60209
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I204c53690f99803900e6613188a6d9a14370e007