diff options
| author | Jeff Davidson <jpd@google.com> | 2014-11-26 23:46:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 23:46:44 +0000 |
| commit | c452bac6fc100bf30d4ddde5b4e008dd862750e5 (patch) | |
| tree | 0b9c3e97cedb499d68e9276d9f745f9a3d9b3b3a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c69c8dc15972179728932f91dde483e9d61f34a9 (diff) | |
| parent | 3caf0f8e440fcc9947b8b153464ccdbc62640c97 (diff) | |
am 3caf0f8e: Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev
* commit '3caf0f8e440fcc9947b8b153464ccdbc62640c97':
Add string for "Connected via Wi-Fi assistant".
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions