diff options
| author | Wink Saville <wink@google.com> | 2013-09-06 09:12:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-06 09:12:50 -0700 |
| commit | 50f864480d6e9cf9e4d83b4533e3764753b4d408 (patch) | |
| tree | a8835a3975dfee643c9bf3f2e9646fd0811dcc8a /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dd4efc22c736973ecfa1b7b4af9e71f971dd48b3 (diff) | |
| parent | 59a9884bf8280e2db9db7680370e98f40a065d56 (diff) | |
am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev
* commit '59a9884bf8280e2db9db7680370e98f40a065d56':
Do not change NetworkInfo.DetailedState.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions