am b8d37e77: (-s ours) am 1512e8a6: am f8313c34: am 669c3823: am 4aed7b07: Reconcile with jb-mr1-release - do not merge

* commit 'b8d37e7761166655c197aaf9622113676fa2971d':
am 788910f0: Merge "Add new action bar demos:" into jb-mr2-dev

* commit '788910f061ee94f8d67bdcf36dcddf874e2809bd':
  Add new action bar demos:
Updating code style file to intellij 10 contents.

Also updated the import on demand values from 99 to 9999 to avoid
usage of '*' in import statements.

Change-Id: I8a9002edb80ed976dc2aac6f51e96bb0f01d5987
Allow bash scripts to work within a distributation folder.

- Fixed NullPointerException when module name not found.

Change-Id: I8f9b29f047ff90995d4cccc6b4b518bfbf026570
Merge "Updating code style file to intellij 10 contents."
Merge "Allow bash scripts to work within a distributation folder."
Add support for distribution folder.

Changed template directory to be dynamically looked up.

Change-Id: I89b96581e842574e1c7ad36e8633d3e787f488c2
am 3de0bf97: Add API demo for WindowInputToken.

* commit '3de0bf970aad60095b455f9717e8035447df49b1':
  Add API demo for WindowInputToken.
am ba6e0af5: am 7398b953: am e9fc6c19: Merge "[ARM] Add unwind portable header adaptor."

* commit 'ba6e0af54597a43e6fd691f4db72d93c28e3c44a':
  [ARM] Add unwind portable header adaptor.
am 919e1de3: Merge "Add API demo for a custom layout." into jb-mr2-dev

* commit '919e1de34de1aeb34de30720e6443e569e2d14e0':
  Add API demo for a custom layout.
am b74c3ef7: am f39c1088: am 7b9e308b: Merge ""debug" in those modules is discouraged"

* commit 'b74c3ef70bd124cabb9c0d57a95a05b4e2b30c43':
  "debug" in those modules is discouraged
am 569dfe08: Merge "Connectivity: Add Wifi Scan test" into jb-mr2-dev

* commit '569dfe08d03b1f2458e635bc71de4d6c3e162eb3':
  Connectivity: Add Wifi Scan test
am ce0385a4: Merge "move emulator HALs to device/generic/goldfish" into jb-mr2-dev

* commit 'ce0385a450b416e2b9d9ff1432d4c0bc9690125b':
  move emulator HALs to device/generic/goldfish
am 4f0b10aa: am 0e21e8b9: am 22c2d527: am 56eb96fc: am ac5a7844: am c5d5c3db: Merge "bitmapfun: Add support to use inBitmap option" into jb-mr1-dev

* commit '4f0b10aa1ed52382dcefd3c539c3a89165e7e1a3':
am f6749fe8: am fa7910ed: am 9b58e08b: am 36893523: am 0c5b72b4: am e826ee24: Merge "Bitmapfun Sample: Add additional sample images." into jb-mr1-dev

* commit 'f6749fe8b448f4c747ccf7e27f2b5b85509ee041':
am d40239e3: am 8ae5c7b6: am 0fd0b16f: am 005ea967: am 0ff44f00: am 5f51b7fb: Bitmapfun Sample: Add some docs and clean up some method naming.

* commit 'd40239e3d2b34f4109e831f28f1640998efb04a9':
am 05f409b6: (-s ours) am 240f3771: am 86dea47b: am 0327ed0d: am 0c0bad05: (-s ours) am 4aed7b07: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '05f409b61cb1ac0d33db6fc16ad126e441212260':
am 574bec3b: am 573642d8: am f3084087: am ee77f868: am 85364937: Add InteractiveChart sample code for update to Gestures training class.

* commit '574bec3b90b494d98c88378689983027c8b773e4':
  Add InteractiveChart sample code for update to Gestures training class.
am def9515c: Merge "Update ApiDemos to use new input source check" into jb-mr2-dev

* commit 'def9515cb018807a5f441fe27e621759bdcd5b6b':
  Update ApiDemos to use new input source check
am dafe2546: Merge "Example code for FileProvider." into jb-mr2-dev

* commit 'dafe2546c9b83f41903ea726f8ff4d74730c9c1f':
  Example code for FileProvider.