Phil Weaver 5649d3e93b Merge "Add null check to a11y call." into oc-dev am: 9289faa163 ...

am: 6f40533f4e

Change-Id: I096085f2da8bdde5b53167d25d0beabcb3d491cb

2017-05-15 17:13:49 +00:00

..

java

Merge "Add null check to a11y call." into oc-dev am: 9289faa163

2017-05-15 17:13:49 +00:00

jni

Merge "Fix recent apps in system UI for Skia pipeline" into oc-dev

2017-05-13 01:52:23 +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 "Add camera lift trigger to GestureLauncherService"

2017-05-15 16:20:42 +00:00

tests

Merge "Use placeholderCount-1 if using default layout." into oc-dev am: 260d6c6e8c

2017-05-15 16:51:41 +00:00