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:42:53 +0000 (05:42 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:42:53 +0000 (05:42 -0700)
Change-Id: I0839dac295b83f3c5d53d0bb81925b44e3ec17cc


Trivial merge