diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2015-07-09 17:43:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 17:43:06 +0000 |
| commit | 8d6620bd1ce06e8312a8d9c9974fe981f9388e64 (patch) | |
| tree | a7c0f51cea90d9399b3684199985f829c231f82e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 923f55a549957e4fb1edc24086ee80157e6050bf (diff) | |
| parent | 30d822e2bdfde4360fc072f7f4ee16c83ac9dcc8 (diff) | |
am 30d822e2: am b091695b: Merge "Revive NetworkInfo\'s SUSPENDED state." into mnc-dev
* commit '30d822e2bdfde4360fc072f7f4ee16c83ac9dcc8':
Revive NetworkInfo's SUSPENDED state.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions