OSDN Git Service

am ddad384d: Merge "Fix build."
authorElliott Hughes <enh@google.com>
Tue, 11 Mar 2014 18:17:35 +0000 (18:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Mar 2014 18:17:35 +0000 (18:17 +0000)
commit823051bf9abd98ce736fefae3fa72ae3fa00d268
treec8bb2555134cb0cbf9b40f15423e6275a7e59a9b
parent4f1e25f8185fcac352c74e16c631af8664168502
parentddad384dbf802bf258e19a8d18f5d9e9fba8f97b
am ddad384d: Merge "Fix build."

* commit 'ddad384dbf802bf258e19a8d18f5d9e9fba8f97b':
  Fix build.