Mark Salyzyn fa4c311438 Merge "PdfEditor: define LOG_TAG" am: a3bb8e3cc7 am: 9c0ea2d1cd am: 5aad37e70c ...

am: 5be5a41170

Change-Id: Ia7ee2481592d3df55c3fda94cc1abfb4ea4a95cc

2016-10-24 16:12:43 +00:00

..

java

Merge changes I1a544a8d,Ie78d3fb0

2016-10-24 14:45:46 +00:00

jni

Merge "PdfEditor: define LOG_TAG" am: a3bb8e3cc7 am: 9c0ea2d1cd am: 5aad37e70c

2016-10-24 16:12:43 +00:00

res

Import translations. DO NOT MERGE

2016-10-21 23:40:55 -07:00

tests

Merge changes I1a544a8d,Ie78d3fb0

2016-10-24 14:45:46 +00:00