commit | da437175f18c3684dd31761acbfb824f4471d67e | [log] [tgz] |
---|---|---|
author | Android Merger <android-build-merger@google.com> | Mon Jun 20 17:33:47 2016 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jun 20 17:33:47 2016 +0000 |
tree | 556d3f36359c1cec982c919ec5eac1ef6f420e23 | |
parent | 397f066e4a86887c7f03962fa8038820b9413c6b [diff] | |
parent | 7d67d3fb1399640372d15bce723fc8e75750fcd5 [diff] |
Merge "Merge \"Merge \\"DO NOT MERGE: CTS test case for verifying overflow in libskia JPG processing\\" into kitkat-cts-dev am: e50ec09f51 -s ours\" into lollipop-cts-dev am: 83b7fd487f -s ours" into lollipop-mr1-cts-dev