OSDN Git Service

am 1b496166: am c217d7b7: am 6099a84f: am 2521d0d2: am 5a4183f3: am 267afcde: Merge...
authorGreg Hackmann <ghackmann@google.com>
Mon, 12 May 2014 23:28:49 +0000 (23:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:28:49 +0000 (23:28 +0000)
commita50fc94403a956724e9547b03d4593b884bf012f
treedb34eca2da5ec1662b262862fc44c323209fcb14
parent488557f4213b6e04225ceef88e3093d3c116d7fc
parent1b4961661b19ebb9ca619467a17617ba34889ea9
am 1b496166: am c217d7b7: am 6099a84f: am 2521d0d2: am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64"

* commit '1b4961661b19ebb9ca619467a17617ba34889ea9':