diff options
| author | Sharvil Nanavati <sharvil@google.com> | 2016-03-25 20:20:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-25 20:20:41 +0000 |
| commit | ed4b4b0c99a9865dcf65720e21b57e7b11143fdc (patch) | |
| tree | 5aa4435ef60765b07c11f04a52bc15d286aa40fd /rs/java/android/renderscript/RenderScript.java | |
| parent | 76ba7186febdd2affa9277d8371378e60dcb187b (diff) | |
| parent | 1c7f5bb49c1918be446b967fd78b02313429322f (diff) | |
Merge "DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY." into cw-e-dev am: a677ea7 -s ours
am: 1c7f5bb -s ours
* commit '1c7f5bb49c1918be446b967fd78b02313429322f':
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