OSDN Git Service

Reconcile with jb-mr0-release jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jul 2012 15:41:38 +0000 (08:41 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jul 2012 15:41:38 +0000 (08:41 -0700)
Change-Id: If4a370c83e39eea43d31edcc1554ec1aeb539505


Trivial merge