OSDN Git Service

Reconcile with jb-nakasig-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 15 Sep 2012 15:21:27 +0000 (08:21 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 15 Sep 2012 15:21:27 +0000 (08:21 -0700)
Change-Id: I48d8019902c8848541677a7ddc1aa63edf74b23c


Trivial merge