Jayachandran C 1fd2abcf1d resolve merge conflicts of c4555ee941 to pi-dev-plus-aosp ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I897faef1bc1a32a5cf11a048b3a9dd1c40a9bc24

2018-11-08 13:13:58 -08:00

..

java

Merge "[Call Screening]Logging of calls blocked by call blocking feature, call screening app." am: b5e8d45245

2018-11-08 10:07:13 -08:00

jni

Merge "Refactor native Zygote code." am: d10870625f

2018-11-07 18:15:48 -08:00

proto

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

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

res

resolve merge conflicts of c4555ee941 to pi-dev-plus-aosp

2018-11-08 13:13:58 -08:00

tests

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

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