OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 14:51:53 +0000 (07:51 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 14:51:53 +0000 (07:51 -0700)
Change-Id: Id8e9b62ec7d117c1b6bdbeb739be7148f15f31cb


Trivial merge