Daniel Sandler 560a6b8bff Merge "Cat rescue." into oc-mr1-dev am: 6d6cf285ea ...

am: 9cb9e4526d

Change-Id: I7da6305aec8b81668e19dd1a89747aa3d51ba744

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

..

java

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

2017-09-08 17:12:36 +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