diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-12-29 11:24:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-29 11:25:03 +0000 |
| commit | 424aa97a105344f4553e361ba24a4baa8924f113 (patch) | |
| tree | c201dfcfc55f0fdc6fa8782a82f7f200377f6a9a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fce4eb6810e58deb034eeb2378e03883ea73257e (diff) | |
| parent | 503794154dc9ca2d25a7cd7230ec46168f418000 (diff) | |
Merge "Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446 am: 08ea823955 am: 22faa73586" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions