diff options
| author | Vinit Deshapnde <vinitd@google.com> | 2014-03-10 17:54:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-10 17:54:01 +0000 |
| commit | 5f683ca80611c3e98c91f631ee05dccf3e7e0227 (patch) | |
| tree | bef23dfcebd25f9da7c5bd1c104e0b10c286e0a2 /rs/java/android/renderscript/Program.java | |
| parent | 0a3cb2ce1b2472b7e4ca6739eaeaa50975abf6ab (diff) | |
| parent | 5243a760452dc06ec2fd0c50e1c23c0d8c3d16e7 (diff) | |
am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
* commit '5243a760452dc06ec2fd0c50e1c23c0d8c3d16e7':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions