tree 5f77a06b2d6fa3f17629b29524802f1eebee70c2
parent 8e13dea5f919737738db6e38c56cc83f43a7d555
parent 727741cd610b35e675e7b7769ddf431e5763344d
author Daniel Cashman <dcashman@google.com> 1389813048 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389813048 -0800

am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev

* commit '727741cd610b35e675e7b7769ddf431e5763344d':
  Use pathPrefix filter instead of path for /btopp content