Yueming Wang a91c4ac73c Merge "Add javadoc to explain ApnSetting conflict." into pi-dev am: 3cc7c4fc76 ...

am: 5148a2e55f

Change-Id: I98a93f4f9dad2f50c18b5a14c3500d8598368a33

2018-03-27 10:45:58 +00:00

..

java

Merge "Add javadoc to explain ApnSetting conflict." into pi-dev am: 3cc7c4fc76

2018-03-27 10:45:58 +00:00

jni

Merge "Use ABI_STRING." am: ca7ce49ecc am: da01ce155f

2018-03-23 22:48:35 +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 am: 4b46d3e1e4

2018-03-25 22:31:40 +00:00

tests

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

2018-03-27 01:36:16 +00:00