Merge "Don't back up the scan-always setting." into jb-mr2-dev
update homepage with IO Live banner

Change-Id: Ifd333287a04c426df4db2c00a1f19560c304b839
Correct java API docs for MediaDrm offline use case

Documentation only change, no APIs are affected

Change-Id: I4f3978751928de503f51afa77e0983d4c385ff7b
related-to-bug: 8621588
Add the trace tag for Dalvik.

Bug: 8856374
Change-Id: Id0fbdb8f7a487c5831edcd2c6c64a7da63aec03d
OO NOT MERGE allow connected location providers location access

Cherry-pick of I0c383eb82ed041e57a7d32321df2d67b462d4e21 from master

Oops, it seems the fused location provider was being denied access
to locations when any user other than the primary device owner is
logged in. This was breaking the fused location provider entirely
for all secondary users of a given device.

Bug: 8766225
Change-Id: Ic0db5f2094828c897a405abb0dca6ac39a2ca526
Merge "Correct java API docs for MediaDrm offline use case" into jb-mr2-dev
DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be

Add single crunch command to aapt. do not merge.

Previously the crunch command would work on a full res folder
and output a full res folder (with only the drawables). This
was only used in the SDK.

The incremental logic is moved to the SDK build system so we
change the crunch command (or rather add a new one) to only
crunch a single file.

(cherry picked from commit b1f6ad82dd8d1702617a757a88430604b3131fac)

Change-Id: Ifa0dceed93708658f950322f36c13b6ebe7ab0f3
Fix bug #8839681 Reversed Textbox focus order on RTL and android:imeOptions="flagNoExtractUi"

- make SequentialFocusComparator RTL-aware

Change-Id: I3d9cc81f777d16933a8e1b69f8ed63efa5be0925
am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be

* commit '42fb3abd4b7463626983c1a2768788c901f2e71a':
  DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
am 1181564f: am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be

* commit '1181564fc482171c4c9a84b3c7c1f06ca6eaf2b6':
  DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
am 0974061e: (-s ours) am 1181564f: am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be

* commit '0974061e941f3aa8c3c5c71ca996be5f93a6a865':
  DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
Ensure ViewRootImpl.setAccessibilityFocus() doesn't crash when reentrant.

Internal state must be cleared before calling any methods on the focus
host, since the method may be called again from the host and attempt to
recycle the same AccessibilityNodeInfo twice.

BUG: 8856860
Change-Id: I0410989fd6f3ce3ce29de8edebdfbf3847188843
Merge "Add the trace tag for Dalvik." into jb-mr2-dev
The default home intent needs CATEGORY_DEFAULT

Because the resolve activity always assumes CATEGORY_DEFAULT, there are odd
cases where apps with malformed intent filters wind up interfering with
users' ability to specify a preferred launcher app.

Bug 8805220

Change-Id: I4c1295dc844e442eec6efd603ce11b673879dd5a
merge in jb-mr2-release history after reset to jb-mr2-dev
Merge "OO NOT MERGE allow connected location providers location access" into jb-mr2-dev
Fix for TTS.setLanguage throwing MissingResourceException

Change I766f106b9165932de17de84bdd422d0fc0ae27f1 made getISO3*
methods throw MissingResourceException if locale was invalid.
This causes regression on last android release, where invalid
locale was silently ignored.

+ fix for .isLanguageAvailable

Bug: 8709594
Change-Id: Ieada6b90dc53cfdf0a4e2b4ca69854b811d0fec2
Fix error where clips/matrices are incorrectly transferred.

In these cases the caller passes in a NULL bitmap and expects it
to clear the canvas state. This change preserves that behavior.

bug: 8738494
Change-Id: I7ebf6a74bab3c2822849a3404de3828fec8d3084
Import translations. DO NOT MERGE

Change-Id: Id91ccb35503df68ecc0c3f59c1601e0adf74e876
Auto-generated-cl: translation import
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev