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)
* commit 'b849f6dd638fd1246724160cd5c01ab1a5ff33bd':
  Fix linux build.


Trivial merge