tree 52153fd35ae3922f9d52e3215a8532b2d0fbbf24
parent d2830748a45d31c137765dfc4da3bec89430fd02
parent 847ab1a6f9845725bf5baf013784374fe7003a77
author Yang Ni <yangni@google.com> 1469855425 +0000
committer android-build-merger <android-build-merger@google.com> 1469855425 +0000

Merge \"Revert \"Make RenderScript constants variables instead of macros.\"\"
am: 847ab1a6f9

Change-Id: I2ccfe12eff7b05e239ddce8652c869daa3b5d12f