diff options
| author | Sharvil Nanavati <sharvil@google.com> | 2016-03-25 20:18:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-25 20:18:05 +0000 |
| commit | 1c7f5bb49c1918be446b967fd78b02313429322f (patch) | |
| tree | 504007cc53789a8ad63a0b7fd292fb237f204cc1 /rs/java/android/renderscript/RenderScript.java | |
| parent | 0c7535bb4fbf2306df7039a3358c1216de34cd8f (diff) | |
| parent | a677ea72b159317ebb7456f60703babacef61650 (diff) | |
Merge "DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY." into cw-e-dev
am: a677ea7 -s ours
* commit 'a677ea72b159317ebb7456f60703babacef61650':
DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions