OSDN Git Service

am cb241895: am a9baf879: Merge "fix build"
authorColin Cross <ccross@android.com>
Fri, 14 Feb 2014 00:58:46 +0000 (00:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Feb 2014 00:58:46 +0000 (00:58 +0000)
* commit 'cb241895046e9827801811d8455be120ff2ea9f2':
  fix build


Trivial merge