OSDN Git Service

am b849f6dd: Merge "Fix linux build."
authorBrian Carlstrom <bdc@google.com>
Wed, 25 Jun 2014 21:35:38 +0000 (21:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Jun 2014 21:35:38 +0000 (21:35 +0000)
commit48e29b00b6dfcad2588f79fa67f6317d9d34008e
treeafe0dc3ed038d8b1d97548831a230e7f3160403b
parent663ab27f1598042dd266b196124c735e0c45882c
parentb849f6dd638fd1246724160cd5c01ab1a5ff33bd
am b849f6dd: Merge "Fix linux build."

* commit 'b849f6dd638fd1246724160cd5c01ab1a5ff33bd':
  Fix linux build.