OSDN Git Service

Merge "Add permission whitelist for EmergencyInfo app." into pi-dev
authorTyler Gunn <tgunn@google.com>
Mon, 16 Apr 2018 23:57:15 +0000 (16:57 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 Apr 2018 23:57:15 +0000 (16:57 -0700)
am: 1417d6c543

Change-Id: I6edbde2c8cc7628703b45492d006f5c97485a083


Trivial merge