OSDN Git Service

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


Trivial merge