OSDN Git Service

am ee2a10eb: am 0650d4a2: am 987616ed: Merge "Fix x86_64 build"
authorYing Wang <wangying@android.com>
Fri, 10 Jan 2014 17:42:30 +0000 (17:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Jan 2014 17:42:30 +0000 (17:42 +0000)
commitb3681d1351086ba4dffa4752ac2114c7d8915914
tree1fa5828cfc8c2ba86d3b893d1388d5dacc53de19
parent6e984e2d8cfc3ac7affa59e8b7440c8e5fc8b16f
parentee2a10eb18a5e79fa958afc2d09c65e21c34e174
am ee2a10eb: am 0650d4a2: am 987616ed: Merge "Fix x86_64 build"

* commit 'ee2a10eb18a5e79fa958afc2d09c65e21c34e174':
  Fix x86_64 build