am 849cef07: am 1c92ce10: am 24963e1f: Merge "Revert "docs: gms javadocs"" into jb-mr1-dev

* commit '849cef07389517f3d08c1217c7c4e004ac5f2636':
  Revert "docs: gms javadocs"
am 50246b5b: am 861c55ff: am 2dd93e22: Merge "docs: add correct toc for google reference" into jb-mr1-dev

* commit '50246b5bc637b166aca1ca188c465800506fc2e3':
  docs: add correct toc for google reference
am 9e129f37: am 924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev

* commit '9e129f37b6dd6f8c3d1a3869ae60285a414c8558':
  Add constant for Daydream settings.
am 4015c3f8: Merge "Only show camera widget to setup users." into jb-mr1.1-dev

* commit '4015c3f815fa83e67aa72d2c474e7e6f4c2dd5d0':
  Only show camera widget to setup users.
am bd0e1808: am 4015c3f8: Merge "Only show camera widget to setup users." into jb-mr1.1-dev

* commit 'bd0e180893c33f6958d4940709687ef2a52e8336':
  Only show camera widget to setup users.
Merge changes I8462f040,Ie471f40f

* changes:
  MediaCodec: Allow getting the codec info directly
  MediaCodec: Allow getting the chosen component name
am 2644494a: Merge changes I8462f040,Ie471f40f

* commit '2644494a9841c1f842d790b60911699f09eb63d1':
  MediaCodec: Allow getting the codec info directly
  MediaCodec: Allow getting the chosen component name
am b67ab7cc: am 648de548: Merge "docs: gms fixes" into jb-mr1-dev

* commit 'b67ab7ccd6d09d30caf8a85a9ea20fc991652258':
  docs: gms fixes
am deab6fd2: am b67ab7cc: am 648de548: Merge "docs: gms fixes" into jb-mr1-dev

* commit 'deab6fd2e8bd94c8449fdc2c926f7973c5661b30':
  docs: gms fixes
am 5ea914f2: am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev

* commit '5ea914f21b397ae57195decd0b5e37544d85db8c':
  Fix some typos and missing @param in android.os.Bundle
am 0a40f2d4: am 23b4e5b1: Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev

* commit '0a40f2d4d28d99a6cd1216f3aa47cb10d6b905cc':
  Doc change: add SMP Primer for Android. Support a new "article" toc style in training.
am 04f3b12f: am 5ea914f2: am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev

* commit '04f3b12f1f82784d0b1b8c0812a3d0017b17b69e':
  Fix some typos and missing @param in android.os.Bundle
am 338b3a2f: am 0a40f2d4: am 23b4e5b1: Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev

* commit '338b3a2f96e7625a31f9cb38033d3444d450c387':
  Doc change: add SMP Primer for Android. Support a new "article" toc style in training.
am e431e6a3: Merge "Add logging to try and track down bug 7643792" into jb-mr1.1-dev

* commit 'e431e6a352125f2c51507130cc64e3405625a7ec':
  Add logging to try and track down bug 7643792
am f6fe2444: am e431e6a3: Merge "Add logging to try and track down bug 7643792" into jb-mr1.1-dev

* commit 'f6fe244422166d0120dbbc8c8cf360a99f215d8b':
  Add logging to try and track down bug 7643792
framework: fix notification icons not animating till ticker is updated

Fixes Android issue #15657

Change-Id: If3bb8693d99e3415bcf0fa9adadee5c1bdbb990d
am 27dcf445: am 037b7944: Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev

* commit '27dcf445eb66ea032992ff30b3cd36770e1ab929':
  docs: update javadocs with gcm @value stuff
am ce463847: Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev

* commit 'ce463847db68afbb796377c6a55209e102774f8c':
  Fix bug #7651552 resetRtlProperties() is called way too often
am 46732445: Merge "Include child windows when looking for insertion point." into jb-mr1.1-dev

* commit '46732445b4c02c225544851cb6cf848ec0583494':
  Include child windows when looking for insertion point.
am 69780253: am 27dcf445: am 037b7944: Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev

* commit '697802538fda082de697a287473e1592912c0e78':
  docs: update javadocs with gcm @value stuff