tree 19d5d2571ceedb251234082d5085333506fb517d
parent 72d5ae2d1e488623dca506e927a2c358f9235852
parent 3e860999a5fb6b67cff74e46f8de9abfffe42179
author Vitaly Buka <vitalybuka@google.com> 1455142407 -0800
committer Vitaly Buka <vitalybuka@google.com> 1455142407 -0800

Merge master into aosp-master

3e86099 Replace ' in json constants with "
8b00597 Implement privet properties for changing cloud print endpoints
1e019fa Replace URL with Url in identifiers
03ee8ac Enable support of endpoints override.

Change-Id: I7732dce63d7c349aa71093dff2cc3db2cb94569a