Christine Franks 966f37ae23 Merge "Allow SMS and calling for demo users" into oc-dr1-dev ...

am: 4387d3a523

Change-Id: I163963c15c009eaf70907203cf941e182409eafc

2017-08-09 20:15:33 +00:00

..

java

Merge "Allow SMS and calling for demo users" into oc-dr1-dev

2017-08-09 20:15:33 +00:00

jni

Merge "Fix keyboard focus in VR" into oc-dr1-dev

2017-08-02 22:59:51 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

2017-07-21 15:51:32 +00:00

res

Merge "Inherit theme dark/light scheme for MediaRouter dialogs/button" into oc-dr1-dev

2017-08-09 17:31:48 +00:00

tests

Merge "Optimize filterByLanguage by caching locale objects" into oc-mr1-dev

2017-08-09 18:35:01 +00:00