OSDN Git Service

Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Aug 2012 15:33:53 +0000 (08:33 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Aug 2012 15:33:53 +0000 (08:33 -0700)
Change-Id: I21582e8cedf809f04f7d04d9af5a34c21ea77f41


Trivial merge