OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 27 Jul 2012 21:52:47 +0000 (14:52 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 27 Jul 2012 21:52:47 +0000 (14:52 -0700)
Change-Id: Ie95fe2b6b772217090296b8409f1f1f7326a0a93


Trivial merge