OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 01:04:12 +0000 (18:04 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 01:04:12 +0000 (18:04 -0700)
commita1d73d9be0beafd10642d6db0136b16353a32096
treec04a7333f15e86d260c4c207a9fd06cd23d2b195
parentf8af99b7c10f1441d9a52676724b168f20752270
parent45e306536ff236af59676e7fc213d5ad20be45e2
Reconcile with jb-mr2-release - do not merge

Change-Id: I024b04bf1e47cc7c10209e83f640cc6f12e03274