diff options
| author | Billy Lau <billylau@google.com> | 2015-08-08 02:49:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-08 02:49:54 +0000 |
| commit | e37acf3256c107da2a9c4892225aa7238d148669 (patch) | |
| tree | e22daf5ca245351757edd61105c9e2d576ecff95 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 908109c1f909cbeeb766f551c16121ddd1a3adba (diff) | |
| parent | 4a10b66df364092cdc42a3cfaa990c877b389624 (diff) | |
am 4a10b66d: am 99271a39: am 9751afcf: am 26ab6ed3: am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
* commit '4a10b66df364092cdc42a3cfaa990c877b389624':
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