diff options
author | Wei Liu <luciferleo@google.com> | 2016-02-04 18:47:23 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-02-04 18:47:23 +0000 |
commit | fba5a3b6da329178a6e964c5cf386a3dfd8011d6 (patch) | |
tree | c5bf97b571914cc4ec648a673d71ab7e26729b5e /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 6bfa4286e0701de57e8812f938f7af74c8c1e3e1 (diff) | |
parent | 0218fc7dbb2df36cf5f9ca30075da84e0020b218 (diff) |
Merge "DO NOT MERGE ANYWHERE Put the start of RttService behind a flag." into cw-e-dev am: e2c27eede5 -s ours am: 44b73f54fb -s ours am: 3db7909c7a -s ours
am: 0218fc7dbb -s ours
* commit '0218fc7dbb2df36cf5f9ca30075da84e0020b218':
DO NOT MERGE ANYWHERE Put the start of RttService behind a flag.
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions