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


Trivial merge