am bffd2117: am ef3149f4: Fix build.
authorWink Saville <wink@google.com>
Mon, 7 Oct 2013 00:10:55 +0000 (17:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Oct 2013 00:10:55 +0000 (17:10 -0700)
commitf9b1f2e2b45049d6f8cb455f379f2e36f5642b6a
treef901d7966b7259ab3caaee4eeb95967c3521d75d
parentdf87bf5ff4929499d17a1a51995d95aded0f2a27
parentbffd2117a84bec9cfadef300177efe3b2ac4d89d
am bffd2117: am ef3149f4: Fix build.

* commit 'bffd2117a84bec9cfadef300177efe3b2ac4d89d':
  Fix build.