OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 22:19:27 +0000 (14:19 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 22:19:27 +0000 (14:19 -0800)
Change-Id: Iaa26de823282e7aba1ec495c04de885dd5267982


Trivial merge