summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-05-16 05:43:18 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2013-05-16 05:43:18 -0700
commit44c696d22018c54bdf2345000fe63fa521cb21ef (patch)
treee7420537e8f765f11edcf6edef6f6517891b495c
parent64eae4f3c6c40675bd452714763748393d9a53a4 (diff)
parent0839ae958f8e883e77aae14323a31e98a14e0c00 (diff)
downloadtoroplus-44c696d22018c54bdf2345000fe63fa521cb21ef.tar.gz
Reconcile with jb-mr2-release - do not merge
Change-Id: Ifd47b9ed799076e9dc5141889f1de6c295286a2a
0 files changed, 0 insertions, 0 deletions