OSDN Git Service

am 90b39aba: Merge "fix build"
authorColin Cross <ccross@android.com>
Fri, 11 Apr 2014 08:31:32 +0000 (08:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Apr 2014 08:31:32 +0000 (08:31 +0000)
* commit '90b39abaf95640021d15be70b5841abe8366b33e':
  fix build


Trivial merge