diff options
| author | John Spurlock <jspurlock@google.com> | 2014-03-04 19:15:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-04 19:15:53 +0000 |
| commit | c3371eb5d4bde6dc11499efb313f7529a6bf6d59 (patch) | |
| tree | 2ff6c8cce572ce9906fde973a470da6a4023da42 /rs/java/android/renderscript/Program.java | |
| parent | 0a3bc3c4d204c64267641dcad0d699a5db38d989 (diff) | |
| parent | 49eac16ec00ea63feaafc137a1d313fcb4374b36 (diff) | |
am 49eac16e: am 8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev
* commit '49eac16ec00ea63feaafc137a1d313fcb4374b36':
Show hideycling for non-primary users.
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions