Eino-Ville Talvala b57501a8d9 Merge "CameraManager: Handle camera service being disabled explicitly" into oc-dr1-dev am: 0c0fd0375c ...

am: 01d6fb2c9c

Change-Id: I7a2399498f7f234a09545107b0fdda3cade6ee30

2017-07-14 05:55:35 +00:00

..

java

Merge "CameraManager: Handle camera service being disabled explicitly" into oc-dr1-dev am: 0c0fd0375c

2017-07-14 05:55:35 +00:00

jni

Merge "Make strike-through respect kerning at boundaries"

2017-07-14 02:17:43 +00:00

proto/android

…

res

Merge "Import translations. DO NOT MERGE"

2017-07-14 00:40:08 +00:00

tests

Merge "Implement family fallback."

2017-07-13 20:02:29 +00:00