diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-03-29 23:27:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-03-29 23:27:54 +0000 |
| commit | e17af32fe9fb04eb77396f25eb97343c56c02a2c (patch) | |
| tree | d10e9cad2754c292fdd3d2ceb349849e7c0292c6 /rs/java/android/renderscript/RenderScript.java | |
| parent | 78c9ef7e75c2a40f3f00464617e3a8477ee313c9 (diff) | |
| parent | 5224d65c991149bc00d43f6b377c0aa0158ca001 (diff) | |
Merge changes from topic "am-9997b803e8644e99a7015357856dcda0"
* changes:
[automerger skipped] Merge changes from topics "128455935", "123661746" am: dc4cb81c83 am: 1c906d426d am: 2e0ea1ab5e -s ours am skip reason: change_id I41ae6752756d998739fd7635bcc7765f255806d7 with SHA1 7a7e06d968 is in history
[automerger skipped] Remove SubscriptionManager#setMetered API. am: 9b932fa1a4 am: 8231d3b231 am: 37c9ced0e6 -s ours am skip reason: change_id Ia6772dee1bd566e0be6b06455d92c923d2c01b12 with SHA1 fd838e9585 is in history
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions