diff options
| author | Chen Xu <fionaxu@google.com> | 2019-02-25 23:58:03 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-25 23:58:03 -0800 |
| commit | 1e8cbf571eb402856620f8dbf82144a43ced6a79 (patch) | |
| tree | 5d61d7489c640967c5b2c12361739ad3418251b4 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 6a5cd884a2b905256244dd6dd180146846cf14bc (diff) | |
| parent | 1d8be8bb8095cd87ffe21c0ae66d8f33433dc74b (diff) | |
[automerger skipped] Merge "getSimLocale should return locale rather than string tag" am: 7db49c554a am: 6841e3ce85
am: 1d8be8bb80 -s ours
am skip reason: change_id I850108ce0905d16e538e46ccd4bbf92a2bcfba42 with SHA1 199041f503 is in history
Change-Id: If7830ca281936ced67399a26e3fdb76cc5c9aef8
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions