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

* commit '36da2a208e253d0635bb569cb92ea0e11f489b4e':
  Consolidates config_windowOutsetBottom and circular_display_mask_offset
tree: 4659d7c62b4286c779c00b8c4e772558e4f74c6b
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py