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