tree e97d173c0bc28ea5f660dc353cc6a4fb879692dd
parent 2dd3ff6d7ed63bf937beaacac7465a5f3bc7d34b
parent 2722e40f53f4f714d654bf145d6c471cc9b9978d
author Etan Cohen <etancohen@google.com> 1488949858 +0000
committer android-build-merger <android-build-merger@google.com> 1488949858 +0000

Merge "[AWARE] Update agent initialization to provide valid link properties" am: e8b70faa6c am: 43053f2f94
am: 2722e40f53

Change-Id: If8ab0507326917f7345299e31bb7c392a24aa28e