tree 49a043d3f37c221f38adca91d1b4cf2e4e69c10f
parent 164bbd75087fcd3d6ab2a774dfb06c469be399e3
parent 32f2de2c795891219f436d3128b37bee70656c7f
author Robert Ly <robertly@google.com> 1402507184 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402507184 +0000

am 32f2de2c: changes to support microsites

* commit '32f2de2c795891219f436d3128b37bee70656c7f':
  changes to support microsites