diff options
| author | Billy Lau <billylau@google.com> | 2015-07-29 23:17:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 23:17:55 +0000 |
| commit | ee2ee0f92d6b18c9e09b32d6ceba9fe22db0565d (patch) | |
| tree | 997d3373d55b91858af47ff90f23e2663f71a182 /rs/java/android/renderscript/Script.java | |
| parent | 2864e9d4d04fc0070a17533e2007c49dead1c890 (diff) | |
| parent | be6bfb4c910e02d7e18b732d7f9cf09d5b3e94a7 (diff) | |
am be6bfb4c: am 83749ac9: am a6706627: Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev
* commit 'be6bfb4c910e02d7e18b732d7f9cf09d5b3e94a7':
Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions