OSDN Git Service

am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN."
authorDan Albert <danalbert@google.com>
Mon, 20 Oct 2014 22:01:02 +0000 (22:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 Oct 2014 22:01:02 +0000 (22:01 +0000)
* commit '9295a1354eb8220be9a0a40985253c6cdfac35c3':
  Fix an overflow found by ASAN.

1  2 
tools/aapt/Resource.cpp

Simple merge