Siarhei Vishniakou 919e151bd3 Merge "Dismiss Dialog in post instead of immediately" ...

am: 9b2c026f10

Change-Id: Iceb48f0a6f0172a4de2d3da668a38c7977cf20dd

2018-10-02 15:23:16 -07:00

..

java

Merge "Dismiss Dialog in post instead of immediately"

2018-10-02 15:23:16 -07:00

jni

Merge "Check for null socket name in socket_connect_local."

2018-10-01 10:43:20 -07:00

proto

WM: Add debug information for forced seamless rotation

2018-07-09 14:24:19 -07:00

res

resolve merge conflicts of ee5fc8831e to stage-aosp-master

2018-09-27 16:28:57 +01:00

tests

Merge "Allow wifi and ethenet connected at same time."

2018-10-02 10:57:11 -07:00