tree 7c9e0bc12b5121b6abb80cf803d48785d26a0b62
parent 0383dcc67e4c52e481d3ac3b90be17683f3d81db
parent dfc6fd38d35db73eb0273b17da5b557db5d92813
author Evan Charlton <evanc@google.com> 1410500567 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410500567 +0000

am dfc6fd38: Fix the CTS build

* commit 'dfc6fd38d35db73eb0273b17da5b557db5d92813':
  Fix the CTS build