OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:43:29 +0000 (05:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:43:29 +0000 (05:43 -0700)
commitaffd710b209cd09c5f2137b59a5699e1e521b83d
treef199d364c3acd14773ef885cd7d8caed8d4ddbc7
parentc3e155a298cc047cdab3e1e2c480bd87fbd4d75a
parent9f51d988bcd7115b691a67b851760d0c66f869db
Reconcile with jb-mr2-release - do not merge

Change-Id: Iec30f1654f196ebae279ebf71648a2cb44fedc4b