tree 290b3222eaaffc7d91bc0a7a2985019ea9a10464
parent 39c4dedbc3ed2e86a3f4e96a8f2cd2c7522f93ae
parent a8533f8340ab8fd9b131fe707dfaa5997bc379a9
author Nick Kralevich <nnk@google.com> 1379622957 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379622957 -0700

am a8533f83: am 0586853d: am fe0b250b: BannedFilesTest: fix build.

* commit 'a8533f8340ab8fd9b131fe707dfaa5997bc379a9':
  BannedFilesTest: fix build.