Jakub Pawlowski bf79e36f57 Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd ...

am: 138f75bbc8

Change-Id: I8c821ed86a85892af7a77c4a8080a1e9fde9fdfa

2017-05-26 23:14:27 +00:00

..

java

Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd

2017-05-26 23:14:27 +00:00

jni

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

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

proto/android

strong fp lockout after 20 failed attempts

2017-05-12 13:01:01 -07:00

res

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

2017-05-26 22:16:00 +00:00

tests

Merge "Fixed broken ImageFloatingTextViewTests" into oc-dev

2017-05-26 19:50:42 +00:00