From: Jordan Liu <jminjie@google.com>
Date: Mon, 21 May 2018 21:48:41 +0000 (-0700)
Subject: Merge "Change directory where apns-conf.xml is stored" am: d25198f62f
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0bdaa497a5;p=android-x86%2Fframeworks-base.git

Merge "Change directory where apns-conf.xml is stored" am: d25198f62f
am: d15962b260

Change-Id: Ib0416da63f166b5e3a0ac2ef4210d92eaa39a9ab
---

0bdaa497a5febf220eba7cc736c40fbe2eeb9bf2