OSDN Git Service

am e41370ac: am b4522d54: Merge "fix compiling against 64-bit bionic"
authorColin Cross <ccross@android.com>
Mon, 27 Jan 2014 22:38:07 +0000 (22:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Jan 2014 22:38:07 +0000 (22:38 +0000)
commit3a02873cd551210ce887b2de291c4694ff156480
tree657a44e7dc5b3506d3e95446f6990a7111cc9d2f
parent643e4938cc029489aaf8e010914e3bc129187b65
parente41370ac58669544f6a8bebfef30069d65c8253f
am e41370ac: am b4522d54: Merge "fix compiling against 64-bit bionic"

* commit 'e41370ac58669544f6a8bebfef30069d65c8253f':
  fix compiling against 64-bit bionic