Change-Id: I7ea2591e701140430ab2060ae0ce51af114c3acf

Change-Id: I894a0b62701bd02367ab970813e4c332147351a2

am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545a automerge: 696ea51a
automerge: 0a871379

* commit '0a871379':
  docs: studio revision 1-1

am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb90 automerge: 4826bed5
automerge: 7b3a1180

* commit '7b3a1180':
  docs: android plugin for gradle revisions page

am a6614a12: am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge: efb69b00 automerge: 40191d8e
automerge: cdf07743

* commit 'cdf07743':
  This file is misplaced, and serves no purpose. I am sending it to oblivion.

am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge: 06849911 automerge: c2fa5e20
automerge: 7bf58d0c

* commit '7bf58d0c':
  Add Asset management support for fonts.

am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge: a912fedb automerge: d66f2eb2
automerge: 412e6439

* commit '412e6439':
  Do not paint shadow if outside of the clip area

am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge: 4e474160 automerge: f12d0233
automerge: 5cc0e764

* commit '5cc0e764':
  Changes made by intelliJ 14.1

DisplayContent.mTapDetector is null for any non-default display. When
testing ActivityView DisplayContent.setTouchExcludeRegion() throws an
NPE when dereferencing mTapDetector.

This change adds a null test to avoid the NPE.

Fixes bug 19413700.

Change-Id: I48a66c0ed071c87b38b354eead58a4de97fb47b9

This reverts commit 25207df6.

am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545a
automerge: 696ea51a

* commit '696ea51a':
  docs: studio revision 1-1

am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb90
automerge: 4826bed5

* commit '4826bed5':
  docs: android plugin for gradle revisions page

am a6614a12: am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge: efb69b00
automerge: 40191d8e

* commit '40191d8e':
  This file is misplaced, and serves no purpose. I am sending it to oblivion.

am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge: 06849911
automerge: c2fa5e20

* commit 'c2fa5e20':
  Add Asset management support for fonts.

am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge: a912fedb
automerge: d66f2eb2

* commit 'd66f2eb2':
  Do not paint shadow if outside of the clip area

automerge: f12d0233

* commit 'f12d0233':
  Changes made by intelliJ 14.1

am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545a

* commit 'dbb32faf':
  docs: studio revision 1-1

am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb90

* commit '2d43b730':
  docs: android plugin for gradle revisions page

am a6614a12: am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge: efb69b00

* commit 'a6614a12':
  This file is misplaced, and serves no purpose. I am sending it to oblivion.

automerge: bff1545a

* commit 'bff1545a':
  docs: studio revision 1-1

automerge: cb73fb90

* commit 'cb73fb90':
  docs: android plugin for gradle revisions page

am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge: 06849911

* commit '0a300b89':
  Add Asset management support for fonts.

am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge: a912fedb

* commit 'a0fb87a3':
  Do not paint shadow if outside of the clip area

* commit '221d7320':
  Changes made by intelliJ 14.1

am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs
automerge: efb69b00

* commit 'efb69b00':
  This file is misplaced, and serves no purpose. I am sending it to oblivion.

automerge: 06849911

* commit '06849911':
  Add Asset management support for fonts.

automerge: a912fedb

* commit 'a912fedb':
  Do not paint shadow if outside of the clip area

automerge: 4e474160

* commit '4e474160':
  Changes made by intelliJ 14.1

automerge: 27e554c7

* commit '27e554c7':
  Add BLAS intrinsic.

automerge: 712572d4

* commit '712572d4':
  Add BLAS intrinsic.

* commit '41c93ffe':
  Add BLAS intrinsic.

Change-Id: I95ddc46cb3f6217d2ead1091fd47450389544324

* commit '8c124744':
  docs: studio revision 1-1

* commit '76dd6aa7':
  docs: studio revision 1-1

* commit 'd2856643':
  docs: android plugin for gradle revisions page