OSDN Git Service

Merge "Change directory where apns-conf.xml is stored" am: d25198f62f am: d15962b260
authorJordan Liu <jminjie@google.com>
Mon, 21 May 2018 22:07:39 +0000 (15:07 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 May 2018 22:07:39 +0000 (15:07 -0700)
commit77254e9b343aba1993299966524342f7a0fbecdb
treed977a47150b1a5f9b9b8f3937e51f910c7f4a215
parent1bf88170494d53f29e5b35af44538bc57cc9e63f
parent0bdaa497a5febf220eba7cc736c40fbe2eeb9bf2
Merge "Change directory where apns-conf.xml is stored" am: d25198f62f am: d15962b260
am: 0bdaa497a5

Change-Id: Ia2f81c8a006df622bfce244693eb883acb123cf2