merged from goog/mirror-m-wireless-internal-release
4e1206b am a6614a12: am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge: efb69b0
merged from goog/mirror-m-wireless-internal-release
06aad89 am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge: 0684991
merged from goog/mirror-m-wireless-internal-release
2e7db07 am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge: a912fed
merged from goog/mirror-m-wireless-internal-release
88542b8 am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge: 4e47416
merged from goog/mirror-m-wireless-internal-release
3118ae8 am 474746c7: am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge: fe2c687
merged from goog/mirror-m-wireless-internal-release
fd8069c am 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge: e0306bb
merged from goog/mirror-m-wireless-internal-release
df062f6 am b14aec1b: am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs automerge: 946bf2d
merged from goog/mirror-m-wireless-internal-release
dfc0a77 am f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
merged from goog/mirror-m-wireless-internal-release
75f4217 am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev
merged from goog/mirror-m-wireless-internal-release
be828a3 am c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
merged from goog/mirror-m-wireless-internal-release
ab3356d am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
merged from goog/mirror-m-wireless-internal-release
5984dab am c38b90bb: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev
merged from goog/mirror-m-wireless-internal-release
5a28b16 am 696b68c4: am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
merged from goog/mirror-m-wireless-internal-release
face792 am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
merged from goog/mirror-m-wireless-internal-release
5788e25 am f35e8159: am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge: 2b36779
merged from goog/mirror-m-wireless-internal-release
28972ed am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
merged from goog/mirror-m-wireless-internal-release
813ac73 am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
merged from goog/mirror-m-wireless-internal-release
a40e069 am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
merged from goog/mirror-m-wireless-internal-release
cd6bf02 am 3d521c0a: Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev
merged from goog/mirror-m-wireless-internal-release
3c75d26 am 07c745b5: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev
merged from goog/mirror-m-wireless-internal-release
254dc28 am 5ac30e10: am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
merged from goog/mirror-m-wireless-internal-release
f08036f am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
merged from goog/mirror-m-wireless-internal-release
a1b14e3 am 060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
merged from goog/mirror-m-wireless-internal-release
56bc490 am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev
