diff options
| author | Tingting Wang <tingtingw@google.com> | 2015-07-17 18:31:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-17 18:31:28 +0000 |
| commit | a14b03392bebdab1e625e81ffb4b7abae49cdb89 (patch) | |
| tree | 2d15e37cfc85da4cdbe2c572baa3be759b1ce5cd /rs/java/android/renderscript/RenderScript.java | |
| parent | 2d395df9511e3946a4de144cd44cb7a5f9cac1d3 (diff) | |
| parent | ad359f2e705280e26198890a95d53e3566126bcc (diff) | |
am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev
* commit 'ad359f2e705280e26198890a95d53e3566126bcc':
Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions