OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 May 2013 19:54:44 +0000 (12:54 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 May 2013 19:54:44 +0000 (12:54 -0700)
Change-Id: I6c8f974fdf7022bfe1cc0ca00a3cf1466d641428


Trivial merge