tree da03523af2c9ed5139cfd45d8efcf6cdb0226a20
parent b0d449b9cce488474fbff6cedfe9c5e283158e3f
parent 914c8c871ac47633fbd704a354fce788f9b2b7b7
author Yusuf Ozuysal <yusufo@google.com> 1440453964 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440453964 +0000

am 914c8c87: Merge "Revert "Add a way of generating a CustomTabsSessionToken from an intent"" into mnc-dev

* commit '914c8c871ac47633fbd704a354fce788f9b2b7b7':
  Revert "Add a way of generating a CustomTabsSessionToken from an intent"