tree 0c1341c31fa203c5552622091fa7171040889efc
parent b09a66d28e21fc019ea0a88fa57ce5f3c54e710a
parent c21b79e22d1e9ad2384844fdaa4b0c2b5945e914
author Jeff Sharkey <jsharkey@android.com> 1384331379 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384331379 -0800

am c21b79e2: Fix build breakage.

* commit 'c21b79e22d1e9ad2384844fdaa4b0c2b5945e914':
  Fix build breakage.