Benedict Wong ebf59a8962 Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am: d0ac50bcad am: 8caa274ade ...

am: 9de5c77303

Change-Id: I4140f386687c579044f9b5fe59dd7e05f86000fe

2017-12-19 00:41:55 +00:00

..

java

Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am: d0ac50bcad am: 8caa274ade

2017-12-19 00:41:55 +00:00

jni

Merge "Fix temporary file name strlcpy size."

2017-12-16 00:24:47 +00:00

proto/android

Add surface/shown position to proto output

2017-12-15 18:44:43 +01:00

res

Merge changes from topic "aod_wallpapers"

2017-12-19 00:18:49 +00:00

tests

Presubmit FormatterTest and SpannableStringBuilderTest

2017-12-18 11:48:32 -08:00