OSDN Git Service

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


Trivial merge