diff options
| author | chen xu <fionaxu@google.com> | 2019-03-05 17:22:30 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-05 17:22:30 -0800 |
| commit | 845bcc101bfbce0b99361f8935e5a1b064473aea (patch) | |
| tree | 77df0dcd181f9205cf2f0ff6013577ed05fab6a9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 606841735addde75fbc32ea30cb65d57c9d3eca9 (diff) | |
| parent | a465f8907f27c4602b8918e6e3977109b0ea5cee (diff) | |
[automerger skipped] Merge "add missing annotation for TelephonyManager APIs" am: 792ce880ad am: 7ce366a28e
am: a465f8907f -s ours
am skip reason: change_id I39cb57db7cc1105bf74eb18ecf15ddbdc6e44f0c with SHA1 8be2a2ed14 is in history
Change-Id: I406ccd6166edd2206aa64c3029e7c340ac60b563
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions