OSDN Git Service

Reconcile with jb-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Jul 2012 22:03:25 +0000 (15:03 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Jul 2012 22:03:25 +0000 (15:03 -0700)
Change-Id: I8a58307dd78dc6fa26d197408853e4f717b5bae9


Trivial merge