OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Jul 2013 14:37:08 +0000 (07:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Jul 2013 14:37:08 +0000 (07:37 -0700)
Change-Id: I04a3eda1cc82e255fe06d697a783f61d4f8ebf21


Trivial merge