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:18:55 +0000 (14:18 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 22:18:55 +0000 (14:18 -0800)
Change-Id: I1ff0e098597e9de600fbec6b6661206e66a72afc


Trivial merge