diff options
| author | Jungshik Jang <jayjang@google.com> | 2014-06-02 11:44:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-02 11:44:04 +0000 |
| commit | 3aa7a9c73272f0e267b5e643ac51181c1a4769f6 (patch) | |
| tree | 195b87c53dc710ea9d45320d844d74897ac3e843 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 65d2fed97405c0fb8c1850bf9b1ed024a07e738d (diff) | |
| parent | 9a4e0f12058545780fda59b904c56872f7bd1ca7 (diff) | |
am 3b140c63: (-s ours) Merge "DO NOT MERGE: Do not reply with <Feature Abort> to CEC Broadcast message" into lmp-preview-dev
* commit '3b140c63aa991d700cf7a11cfd9653b8d7a9ee65':
DO NOT MERGE: Do not reply with <Feature Abort> to CEC Broadcast message
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions