diff options
| author | Erik Kline <ek@google.com> | 2017-10-06 09:45:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-06 09:45:07 +0000 |
| commit | af15f857338712f6de211d86aeae4e367b6f2949 (patch) | |
| tree | 1fd5f4ff34c6ff76f26aee5084693d14e69518eb /rs/java/android/renderscript/Script.java | |
| parent | 18092bbd5491e22b1821a42f19d54a2efa14b48a (diff) | |
| parent | 35d9ddf06deb80a8d133f42c25a22fc220013be0 (diff) | |
Merge "Log NAT update descriptions when receiving netlink errors" am: 3506aaf992 am: cb2860362b
am: 35d9ddf06d -s ours
Change-Id: I4a971e6010049e8afc44d4c122405ec09f892f89
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions