diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-15 01:57:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-15 01:57:25 +0000 |
| commit | aa7b14501a5ac7ac5a0ec1425589d8c2bfa6fc17 (patch) | |
| tree | 9df06fed035c051c3db05dd5c519bf2491dfde5f /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | aa3694f2b3396f0ea9c9cccb7dbe8d5664e1e691 (diff) | |
| parent | 63461e61b9aba2514fb39f87b8741b6db1f7e5d7 (diff) | |
am 63461e61: Merge "Bump mms whitelist time up to 1 minute." into mnc-dev
* commit '63461e61b9aba2514fb39f87b8741b6db1f7e5d7':
Bump mms whitelist time up to 1 minute.
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions