tree 9588959c70f0284502cfc7a88e65cc9d8b9c92af
parent 1cd2f783e4ad6d962c81aca59960fd8f2e774ad1
parent e31775b3eee19595335d62bcbe3ad699d1e7e656
author Shih-wei Liao <sliao@google.com> 1296097875 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296097875 -0800

am 957ee34d: am b9d69d59: Merge "For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)" into honeycomb

* commit '957ee34d73e6b0bec91edaad57be641834855758':
  For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)