Ruchi Kandoi cd9d36f665 Merge "Make NFC AIDL callbacks oneway" am: 99c805b319 am: a50b393781 ...

am: 3377e1fc91

Change-Id: I95e5adffea2ed0d288041ccd357aac7763994359

2017-05-26 22:45:24 +00:00

..

java

Merge "Make NFC AIDL callbacks oneway" am: 99c805b319 am: a50b393781

2017-05-26 22:45:24 +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