Rob Carr 6b81769b1b Merge "Fix incorrect SV calculation in non-RT codepath." into oc-dr1-dev ...

am: f62e79791b

Change-Id: I6c53f8f8da5b8589068a75099717c329c7c463b5

2017-07-20 18:42:15 +00:00

..

java

Merge "Fix incorrect SV calculation in non-RT codepath." into oc-dr1-dev

2017-07-20 18:42:15 +00:00

jni

Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 am: 5c091dc944

2017-07-20 03:05:02 +00:00

proto/android

Prune unused static libs and instant apps if space needed am: f36d53cbfc

2017-05-31 03:59:35 +00:00

res

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

2017-07-20 10:20:21 +00:00

tests

Merge "Disable lock screen by default for demo users" into oc-dr1-dev

2017-07-18 23:30:29 +00:00