OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Aug 2012 15:26:18 +0000 (08:26 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Aug 2012 15:26:18 +0000 (08:26 -0700)
commitd792d355f3828eac7005200395f87e4998ff2adf
treed52083a7227e09b898f6007767ef44658dd22352
parent69c05fc44f0bec42f686fbdb512193637e50d9bb
parent0f32db15da0a22e26091211254d4ea47cda7b8e0
Reconcile with jb-mr1-release - do not merge

Change-Id: I5103348a4d9516d799377625c905fac66c9c9837