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)
am: 35bca7f53b

Change-Id: I349260cae5d0d97f2f0962f62510703c5a94995c


Trivial merge