tree 8e1848938be8907fdc2b7cebb704ec1501142fb0
parent 4fcebfe20e9c7b76ebc6c14fe6adf9fef2f072f9
parent c45009906ade7b25b6c01c02113c044bd9290ffb
author Ching Tzung Lin <ctlin@google.com> 1446054084 +0000
committer android-build-merger <android-build-merger@google.com> 1446054084 +0000

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

* commit 'c45009906ade7b25b6c01c02113c044bd9290ffb':
  Consolidates config_windowOutsetBottom and circular_display_mask_offset