Jason Monk 769139da03 resolve merge conflicts of daeafccfa9 to master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6d45188c96c63af8e60a553f498bfa9fe1834f39

2017-05-29 11:10:28 +02:00

..

java

resolve merge conflicts of daeafccfa9 to master

2017-05-29 11:10:28 +02: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 "Allow notification actions to be configured."

2017-05-25 23:48:45 +00:00

tests

Merge "Regression test: Menu item title updates." into oc-dev am: 834f257f22

2017-05-24 21:11:02 +00:00