sqian 8d391c8580 resolve merge conflicts of 61444e09ff to pi-dev-plus-aosp ...

Test: I solemnly swear I tested this conflict resolution.
Bug: 109809543
Change-Id: If49f6adecb3cae911ba758753679565f9f5d317b
Merged-In: I9f750a72edfc282c80f7547647bcddaf2da51d9b

2018-11-07 23:55:06 +00:00

..

java

Merge "Extend onDnsEvent callback to report more fields." am: 89eb3e6117

2018-11-04 20:54:14 -08:00

jni

Merge "Close statsd log socket before zygote fork()." am: b3d2890291

2018-11-02 14:42:06 -07:00

proto

Merge "Add zhfan as owner of settings_enums.proto."

2018-11-07 19:46:22 +00:00

res

resolve merge conflicts of 61444e09ff to pi-dev-plus-aosp

2018-11-07 23:55:06 +00:00

tests

Fix FormatterTest#testFormatShortElapsedTime due to CLDR 34 change am: 8ac807e010

2018-10-30 05:47:11 -07:00