diff options
| author | Beverly Tai <beverlyt@google.com> | 2017-10-19 15:13:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-19 15:13:57 +0000 |
| commit | 2919a6e6d3864cbdadecbe1aa85cdb986a68ff6a (patch) | |
| tree | f7d3a4383e5ad836626dd3bfec2cae7b255f29cc /rs/java/android/renderscript/ProgramStore.java | |
| parent | 6d332cde18314b0a25c0fa8b220d5f616bded2d0 (diff) | |
| parent | 09ec0dc6f66a0b12c0348c561b1661f9e70a7759 (diff) | |
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509 -s ours am: f1a95220a3 am: c6ca9254ed am: 7fd4bec14a am: b00fd6bb97 am: 93d9ac257d -s ours am: 1ce0456b99 am: a9d3b4d806 am: 1fa3f2a9d0" into oc-mr1-dev-plus-aosp
am: 09ec0dc6f6 -s ours
Change-Id: I876dac52695c20b472e9ec36f02e309967a483a9
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions