tree ebdafc26aa370c4c88bd7dc2cab230696ed8dc89
parent d4c5a50532e123de06bfb96d73e5e891a20da883
parent 4fd115eb21291d301f51aaf6fe260c5e9eecb718
author Daniel Cashman <dcashman@google.com> 1389638971 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389638971 -0800

am 4fd115eb: am 18c10a10: Merge "Use pathPrefix filter instead of path for /btopp content" into klp-dev

* commit '4fd115eb21291d301f51aaf6fe260c5e9eecb718':
  Use pathPrefix filter instead of path for /btopp content