tree cdaa982a3bdd1650bb1da2ba5758c35bbd693a00
parent f488ff8c5ab0f9122586f6944f3ca641d6b25227
parent 4bc5675134b9581a776e033ef4b9c33689f8dc28
author Verena Beckham <verena@codeplay.com> 1459371052 +0000
committer android-build-merger <android-build-merger@google.com> 1459371052 +0000

Merge changes Ic10cba73,I28ab2d92
am: 4bc5675

* commit '4bc5675134b9581a776e033ef4b9c33689f8dc28':
  Ensure arch/generic.c is always included in libclcore_g.bc.
  Make RenderScript constants variables instead of macros.

Change-Id: I5133b7aac2d14c4afd9fd9ee2afd7df959ad7505