commit | 8bb1757531c0269c24d164087f793d638adf9639 | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Thu Apr 20 16:12:50 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Apr 20 16:12:50 2017 +0000 |
tree | 4bb47515fadfd061787ca0a643c040ae5be08138 | |
parent | 824e7a5c2c4b3b269bceeb2a1c2e84c5adb10f02 [diff] | |
parent | 06c68a68ef568e2fc4d1f38969ff8a72ec232d4b [diff] |
Merge "AOD: Fix broken triggers after failed prox check" into oc-dev am: 017f5df1e7 am: 06c68a68ef Change-Id: Ifbcaaf8d580e5c55016040e9bdc5afd27ebcefd6