Vinay Kalia 59a4833681 Merge "Merge "Update ScanSettings documentation for scan modes" am: 8157ab2a0e am: be7ccdf6e9 am: 4b0748ffda" into oc-mr1-dev-plus-aosp ...

am: 7121c28e7f

Change-Id: Ib3ea21d8216c1cc05f00b3b9ddef5f7a908f22df

2017-09-08 20:49:05 +00:00

..

java

Merge "Merge "Update ScanSettings documentation for scan modes" am: 8157ab2a0e am: be7ccdf6e9 am: 4b0748ffda" into oc-mr1-dev-plus-aosp

2017-09-08 20:49:05 +00:00

jni

Merge "Separate GraphicsEnv from libui"

2017-09-06 15:53:00 +00:00

proto/android

Add Rotation Information to WindowManager proto dumpsys

2017-08-28 17:00:01 -07:00

res

Merge "Cat rescue." into oc-mr1-dev am: 6d6cf285ea

2017-09-08 17:12:36 +00:00

tests

Move IntDef constant definitions outside of the annotation

2017-09-08 11:33:28 +00:00