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