diff options
| author | Tyler Gunn <tgunn@google.com> | 2017-04-10 22:30:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-10 22:30:16 +0000 |
| commit | a900430bd0e30394dcfb6a840bd28c6a7b0e1312 (patch) | |
| tree | 4e601d71afbc0d252079b87be82431cfced5c3bb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 368423cf3c2ba3e99f0d0825fca13a55085f7882 (diff) | |
| parent | 1c80ac52fe53b74a79cc096de3b1d45886047e40 (diff) | |
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." am: c4ea961f91 am: 1fb1c39838 am: b428268052
am: 1c80ac52fe -s ours
Change-Id: I7a8b098fd65ba6c0aaf37ed51e662e3066bdba5f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
