OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Mar 2013 16:49:05 +0000 (09:49 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Mar 2013 16:49:05 +0000 (09:49 -0700)
Change-Id: I90d8d0cd290854e97f9919ef58bda3ca9ac3fd07


Trivial merge