tree 65f895fdd705b6ee32f92ec601e8c8fd0c63201a
parent 73e3d9f58c9edd2db254f072bd82bcecb2c13275
parent 3289a5a1e0cee3e9f20769f6036a3c6ae3d7c88a
author Andrii Kulian <akulian@google.com> 1502815465 +0000
committer android-build-merger <android-build-merger@google.com> 1502815465 +0000

Merge "Place black background only behind nav bar when letterboxed" into oc-dr1-dev
am: 3289a5a1e0

Change-Id: Id4069e1c1126d9658a18a448a4bd7566af938cbb