tree ceee4e0e66259b419568356f49b8cb409132c3be
parent c79a37650cbf7749f9b6790b69735956aeb364d6
parent 7eaac5d1e5f27c33db8b050e8918f505f75ec917
author Junda Liu <junda@google.com> 1440676597 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440676597 +0000

am 7eaac5d1: (-s ours) Merge branch \'mnc-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9 into mnc-dev-plus-aosp

* commit '7eaac5d1e5f27c33db8b050e8918f505f75ec917':