OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Jun 2013 23:43:33 +0000 (16:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Jun 2013 23:43:33 +0000 (16:43 -0700)
commite2fe6c041f65faf3279b663b4392f934b898a85b
tree4fcb9c88d56d076a7f7dc66d6ff3118607a247ba
parent20f6c310c70594e077310415b2756c9e1f42d6b5
parent3f7da79c4ec0cd438be3409cd765fd7fd146fa9b
Reconcile with jb-mr2-release - do not merge

Change-Id: I1168e923d0907bf1888bc2f894f7addfb559ca61