OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Oct 2012 14:31:08 +0000 (07:31 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Oct 2012 14:31:08 +0000 (07:31 -0700)
Change-Id: I598988c7b0ec650064de569c6120b27c724c478e


Trivial merge