Change-Id: I6e338dee76063d7d200967bef0ed1122c2769d42

Change-Id: I93b1257563d6352a54141bd4c90d2d4587782fd2

Change-Id: I04431625e922e9554ce55b852bd8ee571049339b

And also remove an unused class.

Change-Id: I50a8a21d99a85cf0d3c301e7b54f434679e1be26

Change-Id: Ie11f0834bf55ae979bff78f249221afd553bfd8b

Change-Id: If5e2b62556e6ee158e09e399c7ddec337dba15d5

Change-Id: I08327dd23072b4e793be40635f105ce0aa5f6f6f

automerge: 23bb3f11

* commit '23bb3f11':
  Profile owner hint in warning for extra CAs

* commit '26e2da8f':
  Profile owner hint in warning for extra CAs

* commit '374c358d':
  Profile owner hint in warning for extra CAs

automerge: 4e298694

* commit '4e298694':
  Check for OOM in BitmapFactory's getMimeTypeString().

* commit 'bf31cb6b':
  Check for OOM in BitmapFactory's getMimeTypeString().

* commit '2458f2b1':
  Fix tests on jenkins

am 2c9d203c: am dc1db5bf: am bc8b0541: am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs

* commit '2c9d203c':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727

am 585be9c0: am 0178c0d7: am 7628b728: am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs

* commit '585be9c0':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181

* commit '8371f2e3':
  Check for OOM in BitmapFactory's getMimeTypeString().

am 1f03d4ba: am fbb27960: am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs
automerge: 159b4091

* commit '159b4091':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680

am 912b2574: am 52aec00c: am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs
automerge: 87df2ea0

* commit '87df2ea0':
  docs: studio index typo

am ea765e7d: am 76094382: am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs
automerge: dbe3aba4

* commit 'dbe3aba4':
  docs: studio bundle checksum update

am 909f840c: am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev
automerge: b1c7f021

* commit 'b1c7f021':
  docs: Checklist for TV Apps

* commit 'fa490b78':
  Fix tests on jenkins

am dc1db5bf: am bc8b0541: am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs

* commit 'dc1db5bf':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727

am 0178c0d7: am 7628b728: am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs

* commit '0178c0d7':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181

am 1f03d4ba: am fbb27960: am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs

* commit '1f03d4ba':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680

am 912b2574: am 52aec00c: am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs

* commit '912b2574':
  docs: studio index typo

am ea765e7d: am 76094382: am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs

* commit 'ea765e7d':
  docs: studio bundle checksum update

am 909f840c: am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev

* commit '909f840c':
  docs: Checklist for TV Apps

* commit '984823f5':
  Fix tests on jenkins

am bc8b0541: am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs

* commit 'bc8b0541':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727

am 7628b728: am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs

* commit '7628b728':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181

am fbb27960: am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs

* commit 'fbb27960':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680

* commit '52aec00c':
  docs: studio index typo

am 76094382: am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs

* commit '76094382':
  docs: studio bundle checksum update

* commit '4c5b5cff':
  docs: Checklist for TV Apps

* commit '7f9582ce':
  Fix tests on jenkins

am 96f11258: am dc649c8d: am 8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727" into lmp-docs

* commit '96f11258':
  docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug: 18759727

am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs

* commit 'decac431':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181

am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs

* commit '4d39cfa4':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680