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:17 +0000 (09:49 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Mar 2013 16:49:17 +0000 (09:49 -0700)
Change-Id: I824c53b5cb75e9076acb41d0e5385499a25f3141


Trivial merge