Andreas Gampe 30348a8abb Merge changes I49057737,I68e3096d am: 50cf621704 ...

am: f5dcc28b0c

Change-Id: Id25418e3def0b63a8c52671546968017cf350d18

2017-08-31 15:27:52 +00:00

..

java

Merge changes I49057737,I68e3096d am: 50cf621704

2017-08-31 15:27:52 +00:00

jni

Merge changes I49057737,I68e3096d

2017-08-31 15:15:31 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

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

res

Merge "resolve merge conflicts of 490d397d28 to oc-dr1-dev" into oc-dr1-dev

2017-08-30 23:40:22 +00:00

tests

Merge changes I49057737,I68e3096d

2017-08-31 15:15:31 +00:00