Jeremy Joslin 99ca0df8d4 Merge "Moved isCallerActiveScorer() to the score service." am: 663b444196 am: 5fbd2791ac ...

am: 11b1311e21

Change-Id: I9e00b4593005729cdf2b01e2347f0513a6d52cf0

2017-01-11 01:50:13 +00:00

..

java

Merge "Moved isCallerActiveScorer() to the score service." am: 663b444196 am: 5fbd2791ac

2017-01-11 01:50:13 +00:00

jni

Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist. am: 54e387ddbe

2017-01-10 23:40:15 +00:00

res

Merge commit '5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a

2017-01-09 14:33:59 -08:00

tests

Merge changes I1eaab5ea,I42928da8

2017-01-11 01:02:05 +00:00