OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 7 Jun 2012 14:51:00 +0000 (07:51 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 7 Jun 2012 14:51:00 +0000 (07:51 -0700)
Change-Id: I73f561b3fb9c76aa30ff7de8eab378a1ba5963cc


Trivial merge