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