diff options
author | Brad Ebinger <breadley@google.com> | 2019-06-13 13:51:48 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-13 13:51:48 -0700 |
commit | 9bccfb780164138ba51ce6037e116c9653696460 (patch) | |
tree | 1b6b9c81a2ed61fef87bbef0a29f182d5eb6252c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 40a280a167ca86e26877a140f5e477d2c3c90153 (diff) | |
parent | 09a6b60098399693d92ef5fe5c39cf2b378f1b6d (diff) |
[automerger skipped] No longer show disambig when calling SmsManager#getSubId am: 26b242f75e
am: 09a6b60098 -s ours
am skip reason: change_id Ibbc07c961f1bdc19e1015885487e9f7b6a14fa83 with SHA1 42ce8673bb is in history
Change-Id: I37c1505f2974d09c4caa43d48f9d0ddaacca1918
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions