summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-07-27 14:50:37 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2012-07-27 14:50:37 -0700
commitf5ccaf88ac614a990171def76e3ff702f6ba55f6 (patch)
treed506654862388fc27e98925544e49346c50b59ea
parentcd48cd744cc263550a855264d62c4843354a0297 (diff)
parent284b5410ad28ac378ac91a9e00a4e7555dd67ce5 (diff)
parent1211d07ea462e8fa3c365eb49a97dc9c20582eac (diff)
downloadcrespo-f5ccaf88ac614a990171def76e3ff702f6ba55f6.tar.gz
Reconcile with jb-mr0-release jb-release
Change-Id: I02023ae3730a5f9388410a2ac19b282163eb273f