Vladislav Kaznacheev 714ccacaaa Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev am: 33f2b3b3b1 ...

am: f2b4b8306e

Change-Id: I8f76715c22c456b2b0aa1dcff88953487ee7399d

2017-05-03 07:45:51 +00:00

..

java

Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev am: 33f2b3b3b1

2017-05-03 07:45:51 +00:00

jni

Merge "Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev am: 9967a4d3af" into oc-dev-plus-aosp

2017-05-02 16:25:03 +00:00

proto/android

Add missing services to incident_report

2017-04-17 15:37:57 -07:00

res

Merge "Import translations. DO NOT MERGE" into oc-dev

2017-05-02 01:48:19 +00:00

tests

Merge "Add "Paste as plain text" in TextView's toolbar." into oc-dev am: 0fe5a2d5b3

2017-05-02 16:40:12 +00:00