OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:38:31 +0000 (07:38 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:38:31 +0000 (07:38 -0700)
commitd5d5927584ce77872dfd070bb3c6558cf6fd441d
treeb7ecb90b14abd16341d34d0118f19da95ab15400
parent6c59bc140981a064431fc8555d78de7d539d9b0c
parentad78b33d9d002643fdb3f8e9d376a36d78212089
Reconcile with jb-mr1-release - do not merge

Change-Id: I1253d2b70d2ba5be1771d5824386c8c42bdbdf0f