Julia Reynolds f9d4e9428b Merge "Properly read vibration setting on boot." into oc-dev ...

am: 2c324042df

Change-Id: I8faa7ef43683d063cd13d54f3961d76621cff31c

2017-05-26 21:52:17 +00:00

..

java

Merge "Properly read vibration setting on boot." into oc-dev

2017-05-26 21:52:17 +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 "Fix and clarify behavior of vertical/horizontal attributes" into oc-dev

2017-05-25 23:05:43 +00:00

tests

Merge "Fixed broken ImageFloatingTextViewTests" into oc-dev

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