OSDN Git Service

am 40a198c6: am b3f2dac1: am 0fd37501: am f518e838: am f1750876: Merge "Revert "HACK...
authorGreg Hackmann <ghackmann@google.com>
Mon, 12 May 2014 23:29:41 +0000 (23:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:29:41 +0000 (23:29 +0000)
commit6739068c9b8635c5bec6adfdeaa5343e96facfcb
treedb34eca2da5ec1662b262862fc44c323209fcb14
parent267e811fb3ff699757f2b6babbbd21ab6b1c7630
parent40a198c6f3ed230c7b89c8df5d58909705986129
am 40a198c6: am b3f2dac1: am 0fd37501: am f518e838: am f1750876: Merge "Revert "HACK: disable emulator on x86_64""

* commit '40a198c6f3ed230c7b89c8df5d58909705986129':