OSDN Git Service

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


Trivial merge