Jakub Pawlowski 84b61fb4b0 resolve merge conflicts of 5671277 to stage-aosp-master ...

am: 5aa4ba3776

Change-Id: Id0926a640dd15d33d6df9582009d587d7bed1872

2016-08-11 23:05:49 +00:00

..

java

resolve merge conflicts of 5671277 to stage-aosp-master

2016-08-11 23:05:49 +00:00

jni

Merge \"Handle long process names correctly.\"

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

res

Import translations. DO NOT MERGE

2016-07-14 06:33:13 -07:00

tests

Merge "Tidy up MockWebServer usage"

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