Jakub Pawlowski 5aa4ba3776 resolve merge conflicts of 5671277 to stage-aosp-master ...

Change-Id: I71e3bd497dbdc0b3f297ad311620aa77bf7225ac

2016-08-11 15:53:06 -07:00

..

java

resolve merge conflicts of 5671277 to stage-aosp-master

2016-08-11 15:53:06 -07:00

jni

Merge \"Handle long process names correctly.\"

2016-07-19 00:19:15 +00:00

res

Import translations. DO NOT MERGE

2016-06-30 17:48:09 -07:00

tests

Merge "Tidy up MockWebServer usage"

2016-08-09 16:16:54 +00:00