OSDN Git Service

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


Trivial merge