Yueming Wang 5148a2e55f Merge "Add javadoc to explain ApnSetting conflict." into pi-dev ...

am: 3cc7c4fc76

Change-Id: I2370b8cc9b5b730d2bf2c4f522d955e952f74bdb

2018-03-27 10:30:37 +00:00

..

java

Merge "Add javadoc to explain ApnSetting conflict." into pi-dev

2018-03-27 10:30:37 +00:00

jni

Merge "Use ABI_STRING." am: ca7ce49ecc

2018-03-23 21:28:16 +00:00

proto

Merge "Fix privacy tags based on go/irpf." into pi-dev

2018-03-27 05:35:25 +00:00

res

Merge "Add UX string tweaks before string freeze." into pi-dev

2018-03-25 22:16:34 +00:00

tests

Merge "Stop using DynamicLayout in case of non selectable PrecomputedText" into pi-dev

2018-03-27 01:11:24 +00:00