summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-05-16 05:43:17 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2013-05-16 05:43:17 -0700
commit0334adfa95167574a4626a8d34fcd22f1ff3ef40 (patch)
treee73c5d04b24d1d5ce798c66f4c262f64b2bb7678
parent2050d366246d3eded17913c8be698e1fcd7d247a (diff)
parent13178b290da73876d7aea5e866b6b14df687d2c8 (diff)
downloadtoro-0334adfa95167574a4626a8d34fcd22f1ff3ef40.tar.gz
Reconcile with jb-mr2-release - do not merge
Change-Id: Ie5d43ce03b1ddc138b4ebe33a0811635db5b971b
0 files changed, 0 insertions, 0 deletions