OSDN Git Service

Merge "Merge "Fix PermissionMonitorTest that has been failing." into pi-dev am: 6e662...
authorChalard Jean <jchalard@google.com>
Mon, 2 Apr 2018 22:51:45 +0000 (22:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Apr 2018 22:51:45 +0000 (22:51 +0000)
commit23304af15400e33f71711ba4938a202d62bbb116
tree96c8d80c9010b02159fe5b87c58544879e340097
parentdd5bc6f1274b0cb6ea422a50a1a0579f881a261f
parent35bca7f53b0a5e50ec1ea4f19410b0de59d28cad
Merge "Merge "Fix PermissionMonitorTest that has been failing." into pi-dev am: 6e66280d35" into pi-dev-plus-aosp
am: 35bca7f53b

Change-Id: I349260cae5d0d97f2f0962f62510703c5a94995c