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)
am: d15962b260

Change-Id: Ib0416da63f166b5e3a0ac2ef4210d92eaa39a9ab


Trivial merge