diff options
| author | John Spurlock <jspurlock@google.com> | 2014-08-18 19:30:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-18 19:30:17 +0000 |
| commit | 2cda14b90936093d08a39cbacd6733713cc0e7c3 (patch) | |
| tree | 74efcf978fb85906655dba8001ad11715858b600 /rs/java/android/renderscript/RenderScript.java | |
| parent | b883a449d3b68f0b1ea4066a6245ec0207747f5c (diff) | |
| parent | c9ae305b562ce06b98c110d7bf8f9f4f12182995 (diff) | |
am 7ef696b6: Merge "Temporary workaround for NetworkOverLimitActivity dialog." into lmp-dev
* commit '7ef696b6ed662abf1066f33d293ccad6f0808126':
Temporary workaround for NetworkOverLimitActivity dialog.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions