diff options
| author | Hall Liu <hallliu@google.com> | 2019-11-18 22:31:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-18 22:31:27 +0000 |
| commit | 1d7a53da981b7d4281c58af7eb9b150163b344a6 (patch) | |
| tree | c6bbb672f39bbae466a53132b050f0d06addbe34 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 3a4addba4b4103d27e2f15e754aebea75b4777f8 (diff) | |
| parent | 7ffa1d11bf6141c14797767cf0ef6c7ecab11fab (diff) | |
Merge changes from topic "mainline4"
* changes:
Add new API for Telecom to send phone state
Minor style correction to avoid merge conflict
non-mainline telephony related AIDL refactor/decoupling
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions