OSDN Git Service

am 14b87526: (-s ours) am ff92b000: am 0e87d180: Merge "Fix potential bugs in allocat...
authorMathieu Chartier <mathieuc@google.com>
Thu, 27 Aug 2015 03:47:27 +0000 (03:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 03:47:27 +0000 (03:47 +0000)
* commit '14b87526211693a39f3adf2b3d47a31058791523':


Trivial merge