diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-05-02 21:38:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-02 21:38:35 +0000 |
| commit | 707abd5f40e4e50f831a7f3c66422cd503825ecb (patch) | |
| tree | 265384d9be837fc82567b2b67a867851422b1bb3 /libs/rs/rsg_ScriptJavaClass.cpp | |
| parent | 7eb31745d53444a235960641c778a78a2fbc693e (diff) | |
| parent | 6a195db9f73b28b25c66a529dad9aae6b617013e (diff) | |
Merge changes from topic "am-8180b640df344549896df06fe011cc0d" into qt-dev-plus-aosp
* changes:
Merge "RESTRICT AUTOMERGE Finalizing Q resources" into qt-dev am: 8bbcd7e4ac
Merge "RESTRICT AUTOMERGE Remove deprecated System APIs added in Q." into qt-dev am: 3f38719b74
Merge changes from topic "QT-SDK-Finalization" into qt-dev am: 917936172f
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions