Siyamed Sinir fdbb552d3b Merge "Dont try to autoSize if TextView is not measured" into oc-dev am: 42b2760525 ...

am: 6a95c58508

Change-Id: Ib79628f6804350222b7d68b49e32aeb99f6cf39c

2017-05-30 13:40:53 +00:00

..

java

Merge "Dont try to autoSize if TextView is not measured" into oc-dev am: 42b2760525

2017-05-30 13:40:53 +00:00

jni

Merge "HIDL: C++ Java parity" into oc-dev

2017-05-26 18:31:58 +00:00

proto/android

Merge "strong fp lockout after 20 failed attempts" into oc-dev am: 310818ff82

2017-05-13 00:03:18 +00:00

res

Merge "Don't show ripple effect on the element replacing "See All"" into oc-dev am: bacaffa497

2017-05-30 13:11:47 +00:00

tests

Merge "Fixed broken ImageFloatingTextViewTests" into oc-dev am: 76926df97e

2017-05-30 12:29:13 +00:00