tree ceee4e0e66259b419568356f49b8cb409132c3be
parent 7dbf01b144412a948cb328fcb4d4a65d620f736e
parent 6073d482f88243feb8abdda982ad27e101ab75ec
author Dan Albert <danalbert@google.com> 1440676596 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440676596 +0000

am 6073d482: (-s ours) am 7a80f8db: Update gold to build #2098274.

* commit '6073d482f88243feb8abdda982ad27e101ab75ec':