tree cc11cd362b618789862f7b6783b96fc0245ee16b
parent 6a38c86dd892b272a354d2b1164e78eebaaf907e
parent 571c5a26f767f67118f34ca0d426aeeb4a287b2c
author Dan Albert <danalbert@google.com> 1429055091 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429055091 +0000

am 571c5a26: Merge "Fix UB in ResourceTable::stringToInt."

* commit '571c5a26f767f67118f34ca0d426aeeb4a287b2c':
  Fix UB in ResourceTable::stringToInt.