diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-07-17 17:47:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-17 17:47:54 +0000 |
| commit | 098a88e6a330c123c3daeda334e91c8656ecb4b2 (patch) | |
| tree | a5e69ff7faac19a1ec386305c5643b57fef8e824 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7a8f20065a777b130a1aa46dc2152e34190f1947 (diff) | |
| parent | 2a500e32169b53679db83077e57f3c9cd02cfd36 (diff) | |
am 2a500e32: Merge "Revert "Temporary lower GET_ACCOUNTS protection level"" into mnc-dev
* commit '2a500e32169b53679db83077e57f3c9cd02cfd36':
Revert "Temporary lower GET_ACCOUNTS protection level"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions