OSDN Git Service

Merge "Add permission whitelist for EmergencyInfo app." am: 3fb7c4740e am: bd96a65d1c
authorTyler Gunn <tgunn@google.com>
Mon, 16 Apr 2018 05:49:53 +0000 (22:49 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 Apr 2018 05:49:53 +0000 (22:49 -0700)
commitcdc555f4890479813c72a928f67bcbaf0e6847d8
treee24c5bc6628a89678ce25323d9fd586e4f9dbc7e
parentffa3898eb23efc9a832bca1076e46f4294d85a53
parent5dfc73a3eeb3c642118eb4853256f28933c08d0e
Merge "Add permission whitelist for EmergencyInfo app." am: 3fb7c4740e am: bd96a65d1c
am: 5dfc73a3ee

Change-Id: I2cfc893f8e636790a837e0f71f9f42ea723c8e31