am 2b9846d9: am f0093857: fix a couple bugs in sidenav for samples. Previously, clicking a link still invoked the expand collapse behavior. Previously, collapsing a parent item did not also collapse its children.

* commit '2b9846d9d1c075068d192f75f73f44896c95b7db':
  fix a couple bugs in sidenav for samples. Previously, clicking a link still invoked the expand collapse behavior. Previously, collapsing a parent item did not also collapse its children.
am 1ef0d363: am 285f0772: Merge "clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav" into jb-mr2-docs

* commit '1ef0d36382388e51d011d2dd481d11750a4a858a':
  clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav
remove project structure from sample landing pages

Change-Id: I646aa996ce518421567c09bbb3a0cd8b4875d530
am f1d5a3b1: am 2b9846d9: am f0093857: fix a couple bugs in sidenav for samples. Previously, clicking a link still invoked the expand collapse behavior. Previously, collapsing a parent item did not also collapse its children.

* commit 'f1d5a3b117ca827c26d901875ac69e2fde0fb106':
  fix a couple bugs in sidenav for samples. Previously, clicking a link still invoked the expand collapse behavior. Previously, collapsing a parent item did not also collapse its children.
am c120c3fe: am 1ef0d363: am 285f0772: Merge "clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav" into jb-mr2-docs

* commit 'c120c3fecb193835d56beec245913111f2fc8e41':
  clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav
am ac2fbe85: am f1d5a3b1: am 2b9846d9: am f0093857: fix a couple bugs in sidenav for samples. Previously, clicking a link still invoked the expand collapse behavior. Previously, collapsing a parent item did not also collapse its children.

* commit 'ac2fbe8507f7295681a528e6858a0fb6676f7324':
  fix a couple bugs in sidenav for samples. Previously, clicking a link still invoked the expand collapse behavior. Previously, collapsing a parent item did not also collapse its children.
am 1ebd160a: am c120c3fe: am 1ef0d363: am 285f0772: Merge "clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav" into jb-mr2-docs

* commit '1ebd160a823668d42a3f8216370035da2b8e7d36':
  clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav
am d4645ea9: remove project structure from sample landing pages

* commit 'd4645ea9d483525175d3d65e7ca90d018f9aa8e9':
  remove project structure from sample landing pages
am fc8140d3: am d4645ea9: remove project structure from sample landing pages

* commit 'fc8140d32afaef4e7af2a76480452aa3ca0009cc':
  remove project structure from sample landing pages
am 504dbfc3: am fc8140d3: am d4645ea9: remove project structure from sample landing pages

* commit '504dbfc3b984e3e7981acba8f0b6e65348838bcd':
  remove project structure from sample landing pages
am bdee9fbe: am 504dbfc3: am fc8140d3: am d4645ea9: remove project structure from sample landing pages

* commit 'bdee9fbe939d13e76cb45aabbcc85a22551ae297':
  remove project structure from sample landing pages
Make it easier to enable obfuscation and optimization.

With this change, use:
* LOCAL_PROGUARD_ENABLED := obfuscation  # to enable obfuscation
* LOCAL_PROGUARD_ENABLED := optimization # to enable optimization
* LOCAL_PROGUARD_ENABLED := obfuscation optimization # to enable both

Now the meaning of the LOCAL_PROGUARD_ENABLED options:
* full:
    Use the build system's default configurations:
    with shrink but no obfuscation or optimization,
    global proguard flags in build/core/proguard.flags
    are applied.
* custom:
    The same as "full" except no aapt-generated resource-related
    proguard flags.
* nosystem:
    Don't use any build system's default configurations; but
    aapt-generated proguard flags are still applied. You are
    responsible for any other flags.
* disabled:
    Disable proguard.
* obfuscation:
    The same as "full" but with obfuscation enabled.
* optimization:
    The same as "full" but with optimization enabled.
* no value (the default):
    The build system chooses the proper value: "full" if it's an
    app; "disabled" if it's a library.

You can use more than 1 of them in a meaningful combination,
for example:
LOCAL_PROGUARD_ENABLED := obfuscation optimization

Bug: 10307372
Change-Id: Id248caca3048e99547f16559fae74f4afe85c354
Remove input flinger stubs.  (DO NOT MERGE)

Bug: 10446930
Change-Id: Ifea564dce9b7b2f8a792dde4119316211febfd59
am af57f8f8: Remove input flinger stubs.  (DO NOT MERGE)

* commit 'af57f8f8cd9e245331505b599dccfa3e9d43fc6a':
  Remove input flinger stubs.  (DO NOT MERGE)
"KRS53D"
Collect and store proguard obfuscation dictionary files.

Collect and store proguard obfuscation dictionary files.
Only do this for apps_only build for now.

Bug: 9407666
Change-Id: I0324eed6bb236abb0d3725f8d2a0b6c5c31935fe
Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
am 7311a344: Make it easier to enable obfuscation and optimization.

* commit '7311a344bed507062e781ba70331d85652c217d8':
  Make it easier to enable obfuscation and optimization.
am afd7457a: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev

* commit 'afd7457adf844692b5de8f8d7eefedcc10dc7da1':
  Collect and store proguard obfuscation dictionary files.
am 04c4d34d: am 7311a344: Make it easier to enable obfuscation and optimization.

* commit '04c4d34d4fdb56c824abf39239d2c87806706b7e':
  Make it easier to enable obfuscation and optimization.