diff options
| author | Victor Chang <vichang@google.com> | 2016-05-31 09:51:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-31 09:51:44 +0000 |
| commit | d6d2497ebe90e74f0ee7ddfdd2a00f4cb2f25dce (patch) | |
| tree | 3eec9483a3a6e1c4be9d32c99adb941d6ac860c7 /rs/java/android/renderscript/Script.java | |
| parent | 76366146c6c2732a4c5790c36a3a08139b2ada2c (diff) | |
| parent | 98801e9f2bec03faf9be0c8bb961150004d309ff (diff) | |
Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev
am: 98801e9f2b
* commit '98801e9f2bec03faf9be0c8bb961150004d309ff':
Finish ConfirmDialog when another vpn app is always-on
Change-Id: If8de5a6c200953599bc3965da57b0de2b1dfb76e
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions