Dmitri Plotnikov a376eed263 Merge "Triggering quiescent reboot during OTA" into oc-dev ...

am: d9417c53e0

Change-Id: I0b2b42d95d739701a367bd5d25bebbd64d033ad0

2017-05-25 16:51:17 +00:00

..

java

Merge "Triggering quiescent reboot during OTA" into oc-dev

2017-05-25 16:51:17 +00:00

jni

Merge "HIDL: C++ Java parity" am: 475d9b283c am: 101aa88ad6

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

proto/android

strong fp lockout after 20 failed attempts

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

res

Merge "Remove time_zones_by_country.xml file" am: 3436fd4833 am: 1541ef3712

2017-05-25 11:01:07 +00:00

tests

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

2017-05-24 20:59:39 +00:00