OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 20 May 2013 15:20:36 +0000 (08:20 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 20 May 2013 15:20:36 +0000 (08:20 -0700)
Change-Id: I326060063e4586e6bfa9edafc93b26a89a47a7b7


Trivial merge