merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Camera: New test to check app firing intent after capturing picture/video

Bug: 7216433
Change-Id: Ib1299b8c67f24e03f41d8b62024bee81c5805320
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I130963155d1be3ddd2b1868b2f2ff0aa55411a19
am 210e6c10: Camera: Relax video snapshot size requirements.

* commit '210e6c10f3b1c4df047132a213c0d401ebceb19b':
  Camera: Relax video snapshot size requirements.
am 376449ba: Merge "add browser benchmarking" into jb-mr1-dev

* commit '376449ba2d1dad95b8260c64d1e043db01b990fe':
  add browser benchmarking
Reconcile with jb-mr1-release - do not merge

Change-Id: Ia18954611049b6a38e93876e65d769c33cde4f15
am 86bfc4c8: Merge "add more buffer sizes for dram test" into jb-mr1-dev

* commit '86bfc4c888d460a6d11dc9e71cb50767dc8e3cea':
  add more buffer sizes for dram test
am 39c16ef7: Merge "Add a CTS test for when location is already within geofence." into jb-mr1-dev

* commit '39c16ef7f5a30148107695a4a9a2e1fc5c2a6095':
  Add a CTS test for when location is already within geofence.
Reconcile with jb-mr1-release - do not merge

Change-Id: I977b9dfb7ceab7907948c849b81402e08e8e9157
am 38c4a564: Merge "Increase timeout for testSetMaxFileSize test" into jb-mr1-dev

* commit '38c4a564a8de4c910f9cfb30c4dc2de41a74a36d':
  Increase timeout for testSetMaxFileSize test
Reconcile with jb-mr1-release - do not merge

Change-Id: I6a8c7ff2e99eba7f6efbd129e274ca8c95ab9314
Report suite name to result server

Send an additional form value indicating what test suite the XML is for.
The test plan name could suffice, but it could get confusing if we run
shorter plans that aren't called CTS. Thus, send an additional parameter
that is separate from the XML.

Change-Id: Iade46dbbf8a16c4883cee9fee434bf296bab8bef
Version number for CTS 4.2
	modified:   tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java

Change-Id: I1de7fa8c0516842a87086d90cfd1eb3302ab09db
am c5215ac7: Version number for CTS 4.2 	modified:   tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java

* commit 'c5215ac7fabb8fa19c0378b620f6d4a655281846':
  Version number for CTS 4.2 	modified:   tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
force reboot after accessibility test

- The accessibilty test makes the device unresponsive.
- This is a temporary solution to prevent affecting other packages as
  the issue persists until reboot

Bug: 7526252
Change-Id: I4bbb340d55f7f1460f761a9e0e783c04db04e065
Merge "force reboot after accessibility test" into jb-mr1-dev
am b974519f: Merge "force reboot after accessibility test" into jb-mr1-dev

* commit 'b974519f52579248c14da451beadee74373e04e5':
  force reboot after accessibility test