tree 6940d72351f1fe1fa1fd7de81e25ea23623c6f31
parent 8ec8904ab51827c35787857de4be5934f949c4b1
parent 6aa90f75f60d788a2c631968ead557c8a46b90a1
author Stephen Hines <srhines@google.com> 1409679928 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409679928 +0000

am 6aa90f75: am 6f8fe420: am ec8778e8: Merge "Fix RS_TRIPLE and RS_TRIPLE_CFLAGS."

* commit '6aa90f75f60d788a2c631968ead557c8a46b90a1':
  Fix RS_TRIPLE and RS_TRIPLE_CFLAGS.