diff options
| author | John Spurlock <jspurlock@google.com> | 2014-08-18 19:39:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-18 19:39:48 +0000 |
| commit | 162b40e4f9584a61aa74a651e3918c1b5c195fb8 (patch) | |
| tree | 8612f73cdbde653d8f6b915ea00b505d1af87469 /rs/java/android/renderscript/RenderScript.java | |
| parent | 7380d866e53849a225cfee562a8049fae8d48035 (diff) | |
| parent | 2cda14b90936093d08a39cbacd6733713cc0e7c3 (diff) | |
am e4cbd7b3: am 7ef696b6: Merge "Temporary workaround for NetworkOverLimitActivity dialog." into lmp-dev
* commit 'e4cbd7b3e096d2aa03a01d38e92090999489ae1f':
Temporary workaround for NetworkOverLimitActivity dialog.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions