tree 0c04f4b9370e7f158e2a65ae66464e5c413ca3a7
parent e31ab64d7f85cc94cdb2d37e7c7cb39931e59e41
parent 43053f2f94cf50af6a62bdf81ccd8d248da14ef6
author Etan Cohen <etancohen@google.com> 1488949712 +0000
committer android-build-merger <android-build-merger@google.com> 1488949712 +0000

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

Change-Id: Ia9fa5b319c9d096c80d2b64c6a89a14c7f20d309