OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 30 Jun 2012 01:28:17 +0000 (18:28 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 30 Jun 2012 01:28:17 +0000 (18:28 -0700)
Change-Id: I0e57086cc66800b7de474af735ebd7ee896e6a25


Trivial merge