OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Apr 2013 14:45:25 +0000 (07:45 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Apr 2013 14:45:25 +0000 (07:45 -0700)
Change-Id: I49fd5e4403bfbd598174527115887dd252dcf17a


Trivial merge