diff options
| author | Makoto Onuki <omakoto@google.com> | 2015-07-16 21:30:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-16 21:30:39 +0000 |
| commit | 89bcc24b0f59b89d1ba9ae2529af3baa795d79ab (patch) | |
| tree | e81e028be098a5437456cc14594736aa60b305c5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e7b7049b95fd02b0b4b4f42bb7a8a33d1b3296c4 (diff) | |
| parent | d737ab1776d1bb7a3402137bdbf3afffe9860c5a (diff) | |
am d737ab17: am b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev
* commit 'd737ab1776d1bb7a3402137bdbf3afffe9860c5a':
DefaultPermission: GET_ACCOUNTS is now in CONTACTS
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions