tree 69f8e2cb42d509c76ff9a6c17a2e60eb5d6618da
parent 346b38cd1048b72886bf9aaf83542caf5b7ef560
parent a05beb29dac5c05a610783469566cf865d92a140
author Ching Tzung Lin <ctlin@google.com> 1446054508 +0000
committer android-build-merger <android-build-merger@google.com> 1446054508 +0000

Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev am: 36da2a208e am: c45009906a
am: a05beb29da

* commit 'a05beb29dac5c05a610783469566cf865d92a140':
  Consolidates config_windowOutsetBottom and circular_display_mask_offset