Daichi Hirono f98d5cb38b Merge "Stop invoke initAppOps in Camera default constructor." ...

am: 0890a2b51e

Change-Id: I6ed52f595757c3ca7308969105f05e6bd55dee65

2018-09-10 20:00:30 -07:00

..

java

Merge "Stop invoke initAppOps in Camera default constructor."

2018-09-10 20:00:30 -07:00

jni

Merge "Rename map names in read_mapinfo"

2018-08-30 12:47:00 -07:00

proto

WM: Add debug information for forced seamless rotation

2018-07-09 14:24:19 -07:00

res

Merge "Add android:usesNonSdkApi manifest attribute"

2018-08-31 03:28:30 -07:00

tests

Merge "Disable tests failing with ICU62"

2018-09-04 02:41:06 -07:00