Felipe Leme aee3ccb15c Merge "Fixed URL used on sample." into oc-mr1-dev ...

am: 6ba7019bb0

Change-Id: I124cbaecd5f8763ecd7f4b06070af48f6b1e0c1d

2017-10-04 00:36:02 +00:00

..

java

Merge "Fixed URL used on sample." into oc-mr1-dev

2017-10-04 00:36:02 +00:00

jni

Merge "VintfRuntimeInfo: do not fetch files that are not needed" am: 3e3e26305a am: 3d1214508b

2017-09-29 09:59:20 +00:00

proto/android

…

res

Import translations. DO NOT MERGE

2017-10-02 01:57:00 -07:00

tests

Merge "Enable experimentation on notification snooze options" into oc-mr1-dev

2017-10-03 00:19:02 +00:00