tree 60031cd5df5e490046d1ada395274a0c99812a1f
parent f12a0823d75bee975545575d96575bce849212f4
parent 18c10a1061cf300ecdb73139f10b5092de0f3cb7
author Daniel Cashman <dcashman@google.com> 1389638777 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389638777 -0800

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

* commit '18c10a1061cf300ecdb73139f10b5092de0f3cb7':
  Use pathPrefix filter instead of path for /btopp content