OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:44:19 +0000 (05:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:44:19 +0000 (05:44 -0700)
Change-Id: I58dee084939bd1b49432bfb4e460dddeb4f6e15a


Trivial merge