OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 29 Nov 2012 23:41:39 +0000 (15:41 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 29 Nov 2012 23:41:39 +0000 (15:41 -0800)
Change-Id: I86943fad736a17b095608fdd4a98411979e31694


Trivial merge