tree e57aef84eab8b458a0748c712817076a5c324866
parent 0c061009758dc28ae1b13f71ea9a934b37de098e
parent 72534d8e61ab628ad32473a9de4a150bd41580da
author Andrew Hsieh <andrewhsieh@google.com> 1440674932 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440674932 +0000

am 72534d8e: (-s ours) am ea6be7d4: Rebuild with r212222 to fix devirtualization bug in GCC4.9 (darwin)

* commit '72534d8e61ab628ad32473a9de4a150bd41580da':