tree da849f4b7eb56b0cc60a5d3cf6554f483904f896
parent 2fe2f5ab6e00e0452c6f7d973c6478c7a52e4855
parent 6fac54d637e6f9eaaa147cba7b534bb058be2654
author Tony Mak <tonymak@google.com> 1455020119 +0000
committer android-build-merger <android-build-merger@google.com> 1455020119 +0000

Merge "Clean up enterprise uri related code in CP2" into nyc-dev
am: 6fac54d637

* commit '6fac54d637e6f9eaaa147cba7b534bb058be2654':
  Clean up enterprise uri related code in CP2