Selim Cinek 727b06b498 Merge "Using transformation method in the ImageFloatingTextView" into oc-dr1-dev ...

am: 997e4ac2bb

Change-Id: Ifffc5f1dfe2a5d606e5eae128cbe0a331d4aaf7c

2017-07-12 19:31:33 +00:00

..

java

Merge "Using transformation method in the ImageFloatingTextView" into oc-dr1-dev

2017-07-12 19:31:33 +00:00

jni

Merge "Remove ALOGD_IF_SLOW" into oc-dr1-dev-plus-aosp

2017-07-12 17:13:19 +00:00

proto/android

Prune unused static libs and instant apps if space needed am: f36d53cbfc

2017-05-31 03:59:35 +00:00

res

Merge "wifi: Params for SAR limits" into oc-dr1-dev

2017-07-12 18:48:55 +00:00

tests

Merge "Using transformation method in the ImageFloatingTextView" into oc-dr1-dev

2017-07-12 19:31:33 +00:00