tree e4ffd68bd2b15f8a1b3edba89e4c4c0cacbea880
parent d2b3815dda57702ebbd00a6422d21a52b0604dfa
parent f6e4c9da5f70604452a28cd308c3b0e4e47f7075
author Ching Tzung Lin <ctlin@google.com> 1446053124 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1446053124 +0000

Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev