OSDN Git Service

Merge "Change directory where apns-conf.xml is stored" am: d25198f62f
authorJordan Liu <jminjie@google.com>
Mon, 21 May 2018 21:48:41 +0000 (14:48 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 May 2018 21:48:41 +0000 (14:48 -0700)
commit0bdaa497a5febf220eba7cc736c40fbe2eeb9bf2
tree68a9ac4e25e220323132b824652a87da197e9d11
parentffcd82cad05f95f060bea4759cd96140ef934909
parentd15962b260becbb5b575e12d4059a8e4aaaa7fcd
Merge "Change directory where apns-conf.xml is stored" am: d25198f62f
am: d15962b260

Change-Id: Ib0416da63f166b5e3a0ac2ef4210d92eaa39a9ab