OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 3 Aug 2012 20:56:03 +0000 (13:56 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 3 Aug 2012 20:56:03 +0000 (13:56 -0700)
commitfa384c7f751ba9320c65ce9a62fbe3007bca3315
treea1c2d75ba2ad3f2fa032e6923bce9ca1c02eee61
parentb78b24e1bf8a1195fd038c874561db80ea2214c5
parent4991dc494395e09ca29da2372ed2840080d31372
Reconcile with jb-mr1-release - do not merge

Change-Id: Id99c83537b1e0ddbfb2f2b8b2b0cfc131df12fe4