diff options
| author | Billy Lau <billylau@google.com> | 2015-08-07 22:34:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 22:34:20 +0000 |
| commit | 9751afcfbc273fecd9f1eafadd25c85e57b4046b (patch) | |
| tree | 09c82c53b8a95b44dafd5c137a68c7cf385dda54 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | efa4dee1263f0e332f015affbcef2234f38e2e93 (diff) | |
| parent | 26ab6ed3efd9bc55e342caabade46d00f8304240 (diff) | |
am 26ab6ed3: am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
* commit '26ab6ed3efd9bc55e342caabade46d00f8304240':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions