Todd Kennedy 00adcb06ab Merge "Add command to retrieve the instant app resolver" into oc-dev am: 2a34734131 ...

am: a17fe9cca6

Change-Id: I02a709b4716a65c27cb3c696adbf5da88627c517

2017-05-12 23:40:31 +00:00

..

java

Merge "Add command to retrieve the instant app resolver" into oc-dev am: 2a34734131

2017-05-12 23:40:31 +00:00

jni

Merge "Fix recent apps in system UI for Skia pipeline"

2017-05-12 17:36:53 +00:00

proto/android

Merge "Switch to protobuf lite"

2017-05-12 22:21:25 +00:00

res

Import translations. DO NOT MERGE

2017-05-12 13:49:56 -07:00

tests

Merge "TextClassifier: Ensure url scheme is in lowercase" into oc-dev am: ebd6bb561d

2017-05-12 23:18:39 +00:00