tree b5b5f79875df93b373e4bcd95ea826d43ee824a1
parent eeafabaf2af663b7abad22ad8d754b7f1b9224ed
parent 9486cad8ed82e746a0dc2dbb4093973d8c4882ae
author Stephen Hines <srhines@google.com> 1415398690 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415398690 +0000

am 9486cad8: am cf56b9f0: Merge "Switch rsg-generator-support to use no STL, since it is pure C."

* commit '9486cad8ed82e746a0dc2dbb4093973d8c4882ae':
  Switch rsg-generator-support to use no STL, since it is pure C.