OSDN Git Service

Reconcile with jb-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Oct 2012 21:47:40 +0000 (14:47 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Oct 2012 21:47:41 +0000 (14:47 -0700)
Change-Id: Ie81134aa556b0deb90dcba3d914d58558f3600a9


Trivial merge