Pinyao Ting 078293aeaf Merge "fix the issue slice cannot be triggered from uri" into qt-qpr1-dev ...

am: 9d7a54238c

Change-Id: If2fd2170471c0a0a4ff029c07a0bd84b2a35da2b

2019-10-18 09:31:47 -07:00

..

java

Merge "fix the issue slice cannot be triggered from uri" into qt-qpr1-dev

2019-10-18 09:31:47 -07:00

jni

Merge "Move JetPlayer implemention and JNI" am: 147d162e10 am: 256948b814

2019-10-17 18:06:18 -07:00

proto

DO NOT MERGE - Merge QP1A.191005.007 into master

2019-10-10 00:28:04 +00:00

res

Merge "p2p: mirgrate p2p into tethering modes" am: 8a9a9adaeb am: 58d08de0c6

2019-10-17 23:19:13 -07:00

tests

Merge "DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master" into stage-aosp-master

2019-10-15 00:24:25 +00:00

xsd

…