OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 28 May 2013 14:37:41 +0000 (07:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 28 May 2013 14:37:41 +0000 (07:37 -0700)
Change-Id: Ia6906f2a43e04fae3489cc3d253fa6bc5dc175f4


Trivial merge