diff options
| author | Yan Yan <evitayan@google.com> | 2020-01-10 00:23:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-01-10 00:23:28 +0000 |
| commit | 614fd1b51bf8576271238acf4e5a7baf82f4e4bd (patch) | |
| tree | e28f228526802286ea25d5b56b6ac322abea9f3d /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 95a2c736e97d2b89298e65714f193b31410d1278 (diff) | |
| parent | 996aa2a14627bc90c110e5af68e0f4854db516e8 (diff) | |
Merge changes from topic "include-uiccapptype"
* changes:
Make mainline IPsec(IKE) to statically include @UiccAppType
move UiccAppType to annotation class
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions