diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2013-06-12 07:23:24 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2013-06-12 07:23:24 -0700 |
commit | 3db1556eaea4a119c4ac9f7772429352f30db7bf (patch) | |
tree | 3041dc197adb2c7cb1d2d7fbe108e809f6749d80 | |
parent | 4f21eb18b30ca69fc586c186f67404907bd6eca8 (diff) | |
parent | 78eeb758d661c0341c29cc35ca0a267aca22050a (diff) | |
parent | 34c9869a8bcf1af20fc9889b2bd98c8d56a1cd33 (diff) | |
download | tuna-tools_r22.2.tar.gz |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not mergetools_r22.2
Change-Id: Ic11a71a5f1f5b0d2032082dfeacbbeab27389e71