am e3c0afc7: am 1ce773ac: am af173898: (-s ours) am b44e8654: am c0adf1e7: am f2a1ab0c: Merge "Fix CTS 4.4 R4 testHoloTheme test failure." into kitkat-cts-dev

* commit 'e3c0afc739f42cd41069842898573fd7d9d636d7':
  Fix CTS 4.4 R4 testHoloTheme test failure.