OSDN Git Service

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


Trivial merge