summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-07-19 08:36:36 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2012-07-19 08:36:36 -0700
commit6efefe02147bed105e57049430b08fb0b1d3e778 (patch)
treed8c19dfb6111435969e1495dee76d5f8686b7a9f
parenta7307ea32550becdc1004c02995c870188ec771b (diff)
parenta573ff9ae3fd7b5a01979648fd6fa34c7e11e7a2 (diff)
parent4a921ca142a309b43870fc0675f94701c73558ce (diff)
downloadcrespo-6efefe02147bed105e57049430b08fb0b1d3e778.tar.gz
Reconcile with jb-mr0-release jb-release
Change-Id: Ic2ec5b153ef7247ed83e6939e71a5222f6c5dd31