OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 27 Sep 2012 16:58:04 +0000 (09:58 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 27 Sep 2012 16:58:04 +0000 (09:58 -0700)
commitf76c31ce58ad02e50af916d9e47cce1b68f85edf
tree91135e5aec4c2ba3373aa2e2181fcd8aa60596af
parent2ac4194854a70c6e319b1b3b647344e595082b38
parent6c729ef4b52c5dbad8a1ca4bf5294e3ecede2851
Reconcile with jb-mr1-release - do not merge

Change-Id: I4e21c53aec26d5503f1640cf06acbadcf9eedb59