| commit | 5304145fbf9bc141396773534757e543f06939cc | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Tue May 22 14:35:11 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 22 14:35:11 2018 -0700 |
| tree | f3b2c499b008815f9ce09450b046c10d9f362edd | |
| parent | 65bed52d7d630f66b32eadccf210fbbe59cb9731 [diff] | |
| parent | f9e9aa4f19924a24282c7990d9003dcc16160d22 [diff] |
[automerger skipped] Merge "Change directory where apns-conf.xml is stored" into pi-dev am: c7de985481 -s ours am: f9e9aa4f19 -s ours Change-Id: I5abf5316e58b6730046ab2f5815b30d9ba3e8403