GitLab

* commit 'f3136431':
  Adjust the redirects for edu and a couple others.

* commit '6dcbcb7a':
  Adjust the redirects for edu and a couple others.

* commit '90b9ab16':
  Adjust the redirects for edu and a couple others.

Conflicts:
	scripts/app_engine_server/redirects.yaml

Change-Id: If68fc5e8461f3f9d63d00cc251e4bed2531d7025

* commit '392804d0':
  Adjust the redirects for edu and a couple others.

Change-Id: I95049ad68a4ecc31354f9e97e10d83114be8bb78

Change-Id: If834a23ad3ad2164e6fdc40f865ee28cfa93de7e

* Headers were copied from frameworks/native/opengl/include/GLES3/.
* Symbol lists were generated with ndk/build/tools/gen-system-symbols.sh.
* Symbols are identical between architectures

Change-Id: I011094ea3b479cf166ffb6bef3778cde683fc502

am 61cf8608: am 58a0f1bc: am af5f663a: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"

* commit '61cf8608':

am 6e58370c: am 4d3ff06e: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"

* commit '6e58370c':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"

am 58a0f1bc: am af5f663a: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"

* commit '58a0f1bc':

am 4d3ff06e: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"

* commit '4d3ff06e':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"

am af5f663a: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"

* commit 'af5f663a':

am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"

* commit '56329479':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"

am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"

* commit '56329479':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"

* commit '6bd35b5b':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"

This reverts commit 2deefec4.

Change-Id: I60be16d5233568a8ffcf6ec09952261b854275a8

Bug: 9425325
Change-Id: I9459fa005c4801cac0c2e28c5afb414620241ad9

am 3d1ead8f: am 2336733e: am 0e7706f3: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build

* commit '3d1ead8f':

am ecd39491: am c3e7bbaf: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build

* commit 'ecd39491':
  make target for gms and gcm javadocs and to automate entire docs build

am 2336733e: am 0e7706f3: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build

* commit '2336733e':

am c3e7bbaf: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build

* commit 'c3e7bbaf':
  make target for gms and gcm javadocs and to automate entire docs build

am 0e7706f3: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build

* commit '0e7706f3':

* commit '128c2f02':
  make target for gms and gcm javadocs and to automate entire docs build

* commit '128c2f02':
  make target for gms and gcm javadocs and to automate entire docs build

* commit '2deefec4':
  make target for gms and gcm javadocs and to automate entire docs build

This is necesary for Lint to handle API 18.

Change-Id: Ida60df3f9149fdb9a4835752b1a9c3e6a3d75082

Made a note to update some other parts of the sample that need
to be fixed after other recent API changes.

Bug: 9380827
Change-Id: I23ccfa9ab434d4c7661ae379b77fa95e128513eb

Change-Id: Iea7d17782f41c91e42a244bf8c67c30b64c43ede

Bug: 9380827
Change-Id: I74b5d5150336be95bd66bab35be8837c9cdf49de

Should still be 18.0.0 but looks like the schemas doesn't support this (yet?).

Change-Id: I2bf61debad74b04ea3678b3226c833abb197ca8f

Change-Id: Id48d7fa1847af58bf8d23ce127ef42b4103db74d

am 64904ff8: am 8abfd5c1: am a0787146: redirect all UI guideline docs to Design docs except for widgets, pending b/9303742

* commit '64904ff8':
  redirect all UI guideline docs to Design docs except for widgets, pending b/9303742

am 8abfd5c1: am a0787146: redirect all UI guideline docs to Design docs except for widgets, pending b/9303742

* commit '8abfd5c1':
  redirect all UI guideline docs to Design docs except for widgets, pending b/9303742

* commit 'a0787146':
  redirect all UI guideline docs to Design docs except for widgets, pending b/9303742