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