diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-06-21 00:53:56 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-21 00:53:56 +0000 |
commit | 0660531df1722567f71b20ed4640beab469e45c0 (patch) | |
tree | 2b475e2014eda4ad63c1a62ef11f61d3d3061f9f /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | f62b91043c62e929e31fff36a7e9ca221d9bd69a (diff) | |
parent | 3d8103c5cac62c14f5c0f644a1afce37bf400e4a (diff) |
Merge changes from topic "am-24a1d38b9196448ba01be8ca57067403"
* changes:
Merge "Revert "Whitelist START_ACTIVITIES_FROM_BACKGROUND permission for"" into qt-dev am: 269907a310 am: 9530705038 am: cd01c44e93
Merge "Allow permission controller to start background activities" into qt-dev am: 574cbd1987 am: b67bcb731b am: 61b1464759
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions