OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 12:57:06 +0000 (05:57 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 12:57:06 +0000 (05:57 -0700)
Change-Id: Ie5b35b4154bf8cc096620a99382b5137ebb5ca81


Trivial merge