Jiaquan He 6b830b4e09 Merge changes from topic 'highlight_fixed' into oc-dev am: 759669988b ...

am: 778523ca5c

Change-Id: Ida41d373fac39153c2f16c1508e81d231872d62b

2017-05-30 13:36:09 +00:00

..

java

Merge changes from topic 'highlight_fixed' into oc-dev am: 759669988b

2017-05-30 13:36:09 +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