diff options
| author | Neil Fuller <nfuller@google.com> | 2017-07-31 14:51:50 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2017-07-31 14:51:50 +0100 |
| commit | 51278f839960cba5b0d6b3900d56c5ad79ab670b (patch) | |
| tree | f3ee7b633897b6600b7766d47fdad2788f711719 | |
| parent | 4daeb2cc35aa3cde886662543ae2e9607f5a8be9 (diff) | |
| parent | fabd370add9d0a6750abac7083329366ee04a268 (diff) | |
| download | TimeZoneUpdater-51278f839960cba5b0d6b3900d56c5ad79ab670b.tar.gz | |
resolve merge conflicts of fabd370 to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I1d7ec13981962db41105f0f32567c6970b2c90ed
0 files changed, 0 insertions, 0 deletions