OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Jul 2013 14:27:43 +0000 (07:27 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Jul 2013 14:27:43 +0000 (07:27 -0700)
Change-Id: Ic45c05e30f974890e8c5320393f95adaf0d0a79f


Trivial merge