diff options
author | Makoto Onuki <omakoto@google.com> | 2016-08-01 22:06:11 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-08-01 22:06:11 +0000 |
commit | 14132bb06e0a3af81f4243f695d11fc52de8e0b6 (patch) | |
tree | f6893170cc7d2e69c0a70f756093b48f33f0d802 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a31a6f9f271af7baf4bae1bb1504470e24d3c2d7 (diff) | |
parent | cb10be47b14e45bbad7fd9131e2e569cf9aec9bc (diff) |
Merge \\"Revert \\"LauncherApps should also throw when user is locked\\"\\" into nyc-mr1-dev am: 5faa852c57 am: 9e05cb8d54
am: cb10be47b1
Change-Id: I919be2385606e37c2a253f5d53a254dda87ca8ef
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions