OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 4 Oct 2012 14:49:33 +0000 (07:49 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 4 Oct 2012 14:49:33 +0000 (07:49 -0700)
Change-Id: Id46d9e98b81fc5767e484afbca9660350932059d


Trivial merge