OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 22:03:17 +0000 (15:03 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 22:03:17 +0000 (15:03 -0700)
Change-Id: I198408ef678851f19476836b10a2fc002dd11a95


Trivial merge