diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-05-02 22:22:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-02 22:22:13 +0000 |
| commit | 0ca0bbb6745e6368a7782f81f4dced49da19d412 (patch) | |
| tree | 51965c98fadc8b246a4c66f020076c351a0209fd /libs/rs/rsg_ScriptJavaClass.cpp | |
| parent | 51ad9d024d9c5aad6e780cb97bdf3390ec8193d0 (diff) | |
| parent | 0c2d2223c66346575684122629bdf378fa5f5e09 (diff) | |
Merge changes from topic "am-6d3c333a1a1a4ced8a6f0af2d10145ec" into qt-dev-plus-aosp
* changes:
Merge "Revert "RESTRICT AUTOMERGE Finalizing Q resources"" into qt-dev am: 6a0faa6592
Merge "Revert "RESTRICT AUTOMERGE Remove deprecated System APIs added in Q."" into qt-dev am: 8b3b7771c1
Merge "Revert "RESTRICT AUTOMERGE Removing deprecated APIs added to Q"" into qt-dev am: 4acb8f46bc
Merge "Revert "RESTRICT AUTOMERGE Android Q is API 29"" into qt-dev am: 40a8e99740
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions