diff options
author | Winson <winsonc@google.com> | 2016-05-27 03:59:59 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-05-27 03:59:59 +0000 |
commit | 2e494ecc219052fbb4f91b290a83c2ef37a0dacf (patch) | |
tree | e80e000883b27db013fc5522fc364e0ccf7ad3ff /rs/java/android/renderscript/RenderScript.java | |
parent | b3c7e1c4f2d700d5621219bde71a1fc095f15d1a (diff) | |
parent | 386a9476160ecd8d7d647d1a305126ec0917e0ab (diff) |
Merge "Prevent setting the launch task id when docking." into nyc-dev
am: 386a947616
* commit '386a9476160ecd8d7d647d1a305126ec0917e0ab':
Prevent setting the launch task id when docking.
Change-Id: Ifbf11755b04dc3e0be9c9a2c170d5aa178b3c4df
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions