tree ed8c9d46bbc1e14fc1aa2ee0ca8c6658a0392224
parent 1d5a259276c897743936b250cde5e22555604d62
parent 44d7989abfe41ffa2d4a5cfba8c0d2f880ac9b8d
author Dan Albert <danalbert@google.com> 1429055735 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429055735 +0000

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

* commit '44d7989abfe41ffa2d4a5cfba8c0d2f880ac9b8d':
  Fix UB in ResourceTable::stringToInt.