OSDN Git Service
Vinit Deshpande [Sun, 15 Mar 2015 20:38:54 +0000 (13:38 -0700)]
am "am
0a300b89: am
ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge:
0684991"
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
Vinit Deshpande [Sun, 15 Mar 2015 20:38:53 +0000 (13:38 -0700)]
am "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
2e7db07 am
a0fb87a3: am
98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge:
a912fed
Vinit Deshpande [Sun, 15 Mar 2015 20:38:52 +0000 (13:38 -0700)]
am "am
221d7320: am
12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge:
4e47416"
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
Vinit Deshpande [Sun, 15 Mar 2015 20:38:51 +0000 (13:38 -0700)]
am "am
024fd0c6: Disable color view animations when stable insets change"
merged from goog/mirror-m-wireless-internal-release
d7a4f64 am
024fd0c6: Disable color view animations when stable insets change
Vinit Deshpande [Sun, 15 Mar 2015 20:38:50 +0000 (13:38 -0700)]
am "am
27ad2e95: Accessibility: Ensure fresh accessilbity focused and input focused nodes."
merged from goog/mirror-m-wireless-internal-release
610f036 am
27ad2e95: Accessibility: Ensure fresh accessilbity focused and input focused nodes.
Vinit Deshpande [Sun, 15 Mar 2015 20:38:48 +0000 (13:38 -0700)]
am "am
d2ccbd43: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
598aa3d am
d2ccbd43: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:47 +0000 (13:38 -0700)]
am "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
3118ae8 am
474746c7: am
2ea209ab: am
8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge:
fe2c687
Vinit Deshpande [Sun, 15 Mar 2015 20:38:46 +0000 (13:38 -0700)]
am "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
fd8069c am
71cf2b6d: am
e726495a: am
fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge:
e0306bb
Vinit Deshpande [Sun, 15 Mar 2015 20:38:45 +0000 (13:38 -0700)]
am "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
df062f6 am
b14aec1b: am
b6de0316: am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs automerge:
946bf2d
Vinit Deshpande [Sun, 15 Mar 2015 20:38:44 +0000 (13:38 -0700)]
am "am
f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
dfc0a77 am
f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:43 +0000 (13:38 -0700)]
am "am
b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
2d5b218 am
b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:42 +0000 (13:38 -0700)]
am "am
20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
1f96024 am
20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:41 +0000 (13:38 -0700)]
am "am
c70d0e71: Fix the javadocs for lock task mode intents."
merged from goog/mirror-m-wireless-internal-release
128b21e am
c70d0e71: Fix the javadocs for lock task mode intents.
Vinit Deshpande [Sun, 15 Mar 2015 20:38:40 +0000 (13:38 -0700)]
am "am
a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" 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
Vinit Deshpande [Sun, 15 Mar 2015 20:38:39 +0000 (13:38 -0700)]
am "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
be828a3 am
c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:38 +0000 (13:38 -0700)]
am "am
0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
22d1f8c am
0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:37 +0000 (13:38 -0700)]
am "am
3292c0e2: Merge "Stop active media projections on user switch." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
a79a38b am
3292c0e2: Merge "Stop active media projections on user switch." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:36 +0000 (13:38 -0700)]
am "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
ab3356d am
50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:35 +0000 (13:38 -0700)]
am "am
c38b90bb: Merge "Make getNetworkInfo() take into account VPN underlying networks." 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
Vinit Deshpande [Sun, 15 Mar 2015 20:38:34 +0000 (13:38 -0700)]
am "am
64ce5f8f: GpsLocationProvider: Read data enabled status from TelephonyManager."
merged from goog/mirror-m-wireless-internal-release
438a92c am
64ce5f8f: GpsLocationProvider: Read data enabled status from TelephonyManager.
Vinit Deshpande [Sun, 15 Mar 2015 20:38:33 +0000 (13:38 -0700)]
am "am
3bb5fdc7: (-s ours) Merge "Check that bitmap's size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
Vinit Deshpande [Sun, 15 Mar 2015 20:38:32 +0000 (13:38 -0700)]
am "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
5a28b16 am
696b68c4: am
24513bc5: am
31622894: am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:38:31 +0000 (13:38 -0700)]
am "am
510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
09a41dc am
510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:30 +0000 (13:38 -0700)]
am "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
face792 am
18fc7b85: am
ba795593: am
9b432bbe: am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:38:28 +0000 (13:38 -0700)]
am "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
5788e25 am
f35e8159: am
99b91b2f: am
c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge:
2b36779
Vinit Deshpande [Sun, 15 Mar 2015 20:38:27 +0000 (13:38 -0700)]
am "am
618e420a: Doze: pulse less often."
merged from goog/mirror-m-wireless-internal-release
45c30574 am
618e420a: Doze: pulse less often.
Vinit Deshpande [Sun, 15 Mar 2015 20:38:26 +0000 (13:38 -0700)]
am "am
c73cfa0f: Accessibiltiy: missed update to the previous patch."
merged from goog/mirror-m-wireless-internal-release
0438c5e am
c73cfa0f: Accessibiltiy: missed update to the previous patch.
Vinit Deshpande [Sun, 15 Mar 2015 20:38:25 +0000 (13:38 -0700)]
am "am
b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev"
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
Vinit Deshpande [Sun, 15 Mar 2015 20:38:24 +0000 (13:38 -0700)]
am "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
813ac73 am
455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:23 +0000 (13:38 -0700)]
am "am
a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" 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
Vinit Deshpande [Sun, 15 Mar 2015 20:38:22 +0000 (13:38 -0700)]
am "am
6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
7638eca am
6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:21 +0000 (13:38 -0700)]
am "am
61333d1b: Merge "Limit cache update to packages that have changed" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
d085a7b am
61333d1b: Merge "Limit cache update to packages that have changed" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:20 +0000 (13:38 -0700)]
am "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
cd6bf02 am
3d521c0a: Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:19 +0000 (13:38 -0700)]
am "am
991db77a: Only request IME if password view is showing"
merged from goog/mirror-m-wireless-internal-release
d0579b1 am
991db77a: Only request IME if password view is showing
Vinit Deshpande [Sun, 15 Mar 2015 20:38:18 +0000 (13:38 -0700)]
am "am
07c745b5: Merge "camera-metadata: clarify the AE precapture trigger spec" 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
Vinit Deshpande [Sun, 15 Mar 2015 20:38:17 +0000 (13:38 -0700)]
am "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
254dc28 am
5ac30e10: am
66c06cf9: am
d224fb8a: am
ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:38:16 +0000 (13:38 -0700)]
am "am
34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev"
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
Vinit Deshpande [Sun, 15 Mar 2015 20:38:15 +0000 (13:38 -0700)]
am "am
060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." 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
Vinit Deshpande [Sun, 15 Mar 2015 20:38:14 +0000 (13:38 -0700)]
am "am
f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
d6d8eb3 am
f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:13 +0000 (13:38 -0700)]
am "am
8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
81918ce am
8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:12 +0000 (13:38 -0700)]
am "am
6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
07141ad am
6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:11 +0000 (13:38 -0700)]
am "am
9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
dc31e4f am
9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:10 +0000 (13:38 -0700)]
am "am
69a62a8b: Merge "Update preference dialog padding to Material" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
5bebf6c am
69a62a8b: Merge "Update preference dialog padding to Material" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:08 +0000 (13:38 -0700)]
am "am
04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
2ef7062 am
04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:07 +0000 (13:38 -0700)]
am "am
9adf1c54: am
ac7b9dd3: am
42d3b66f: am
e0852368: Fix a few typos in Parcel.java."
merged from goog/mirror-m-wireless-internal-release
47baf09 am
9adf1c54: am
ac7b9dd3: am
42d3b66f: am
e0852368: Fix a few typos in Parcel.java.
Vinit Deshpande [Sun, 15 Mar 2015 20:38:06 +0000 (13:38 -0700)]
am "am
cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
a48b550 am
cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:06 +0000 (13:38 -0700)]
am "am
967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
ae4456c am
967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:04 +0000 (13:38 -0700)]
am "am
5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" 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
Vinit Deshpande [Sun, 15 Mar 2015 20:38:03 +0000 (13:38 -0700)]
am "am
3bbc5a11: Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
aed4ec4 am
3bbc5a11: Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:02 +0000 (13:38 -0700)]
am "am
f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
b11af58 am
f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:01 +0000 (13:38 -0700)]
am "am
8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
1b89459 am
8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:00 +0000 (13:38 -0700)]
am "am
bac8e12e: Move layer-list to be top-level element in seek bar progress"
merged from goog/mirror-m-wireless-internal-release
79cc73a am
bac8e12e: Move layer-list to be top-level element in seek bar progress
Vinit Deshpande [Sun, 15 Mar 2015 20:37:59 +0000 (13:37 -0700)]
am "am
81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
b9f0cae am
81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:58 +0000 (13:37 -0700)]
am "am
80252a92: Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
33e7e42 am
80252a92: Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:57 +0000 (13:37 -0700)]
am "am
721a9578: Merge "Replace ic_clear with vector icon" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
b1613a0 am
721a9578: Merge "Replace ic_clear with vector icon" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:56 +0000 (13:37 -0700)]
am "am
c3a043cf: Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS."
merged from goog/mirror-m-wireless-internal-release
722491d am
c3a043cf: Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
Vinit Deshpande [Sun, 15 Mar 2015 20:37:54 +0000 (13:37 -0700)]
am "get channel list from driver for SoftAP channel selection"
merged from goog/mirror-m-wireless-internal-release
18ae1d2 get channel list from driver for SoftAP channel selection
Vinit Deshpande [Sun, 15 Mar 2015 20:37:52 +0000 (13:37 -0700)]
am "Revert "Initial Passpoint code.""
merged from goog/mirror-m-wireless-internal-release
5d7768f Revert "Initial Passpoint code."
Vinit Deshpande [Sun, 15 Mar 2015 20:37:51 +0000 (13:37 -0700)]
am "am
d7310bd1: Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
49c2bc3 am
d7310bd1: Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:50 +0000 (13:37 -0700)]
am "am
fdb2112b: camera2: limit flexYUV array size in DngCreator"
merged from goog/mirror-m-wireless-internal-release
2e6eede am
fdb2112b: camera2: limit flexYUV array size in DngCreator
Vinit Deshpande [Sun, 15 Mar 2015 20:37:49 +0000 (13:37 -0700)]
am "am
39ae0547: Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
8ad51b5 am
39ae0547: Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:48 +0000 (13:37 -0700)]
am "am
ded133c4: Fix broken activation of the selected view in accessibility mode."
merged from goog/mirror-m-wireless-internal-release
f855a3c am
ded133c4: Fix broken activation of the selected view in accessibility mode.
Vinit Deshpande [Sun, 15 Mar 2015 20:37:46 +0000 (13:37 -0700)]
am "am
175ddbcf: am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates automerge:
c6ca860"
merged from goog/mirror-m-wireless-internal-release
be876df am
175ddbcf: am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates automerge:
c6ca860
Vinit Deshpande [Sun, 15 Mar 2015 20:37:45 +0000 (13:37 -0700)]
am "am
515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
15b7627 am
515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:44 +0000 (13:37 -0700)]
am "am
4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
c1c9c31 am
4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:43 +0000 (13:37 -0700)]
am "am
dcce25a9: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de automerge:
9e7e8af automerge:
27d099a automerge:
4a82635"
merged from goog/mirror-m-wireless-internal-release
cd97a64 am
dcce25a9: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de automerge:
9e7e8af automerge:
27d099a automerge:
4a82635
Vinit Deshpande [Sun, 15 Mar 2015 20:37:42 +0000 (13:37 -0700)]
am "am
346a9a2f: am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge:
f02a8d9 automerge:
cacf7da"
merged from goog/mirror-m-wireless-internal-release
d58870e am
346a9a2f: am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge:
f02a8d9 automerge:
cacf7da
Vinit Deshpande [Sun, 15 Mar 2015 20:37:41 +0000 (13:37 -0700)]
am "am
580937fc: am
3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge:
7789447"
merged from goog/mirror-m-wireless-internal-release
2a051ef am
580937fc: am
3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge:
7789447
Vinit Deshpande [Sun, 15 Mar 2015 20:37:40 +0000 (13:37 -0700)]
am "am
1575ca6e: am
1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge:
7e683bd"
merged from goog/mirror-m-wireless-internal-release
da30fd7 am
1575ca6e: am
1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge:
7e683bd
Vinit Deshpande [Sun, 15 Mar 2015 20:37:39 +0000 (13:37 -0700)]
am "am
3548de60: am
5c37c8e6: am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
223e625 am
3548de60: am
5c37c8e6: am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:37:38 +0000 (13:37 -0700)]
am "am
90d5bd8d: am
feb362a5: am
a0d3bfbe: am
5c9d0de1: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation"
merged from goog/mirror-m-wireless-internal-release
65bfa6f am
90d5bd8d: am
feb362a5: am
a0d3bfbe: am
5c9d0de1: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
Vinit Deshpande [Sun, 15 Mar 2015 20:37:37 +0000 (13:37 -0700)]
am "am
147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
617ae0d am
147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:36 +0000 (13:37 -0700)]
am "am
3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
b70233d am
3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:35 +0000 (13:37 -0700)]
am "am
b2dd5cb9: Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
8df98bb am
b2dd5cb9: Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:34 +0000 (13:37 -0700)]
am "am
3c68ca2f: Fix expandSettingsPanel status bar call"
merged from goog/mirror-m-wireless-internal-release
402e5bc am
3c68ca2f: Fix expandSettingsPanel status bar call
Vinit Deshpande [Sun, 15 Mar 2015 20:37:33 +0000 (13:37 -0700)]
am "am
d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
d52eef5 am
d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:32 +0000 (13:37 -0700)]
am "am
fd41feee: Merge "Fix wrap property creation when truncating." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
068560a am
fd41feee: Merge "Fix wrap property creation when truncating." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:31 +0000 (13:37 -0700)]
am "am
e9e2707f: am
f4fa2acb: am
6ccb72e6: am
e0063faa: Merge "docs: linux requirements update" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
d498a8e am
e9e2707f: am
f4fa2acb: am
6ccb72e6: am
e0063faa: Merge "docs: linux requirements update" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:37:30 +0000 (13:37 -0700)]
am "am
1b5a0fb6: am
8f5714d3: am
a3031211: am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
eed98b4 am
1b5a0fb6: am
8f5714d3: am
a3031211: am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:37:29 +0000 (13:37 -0700)]
am "am
9ad282fd: am
2d1c5dc8: am
e4249f29: am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text"
merged from goog/mirror-m-wireless-internal-release
f96fc17 am
9ad282fd: am
2d1c5dc8: am
e4249f29: am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Vinit Deshpande [Sun, 15 Mar 2015 20:37:28 +0000 (13:37 -0700)]
am "am
45446c63: Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
c9466d4 am
45446c63: Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:27 +0000 (13:37 -0700)]
am "am
38710f03: Merge "Fix crash when making emergency calls" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
94e5994 am
38710f03: Merge "Fix crash when making emergency calls" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:26 +0000 (13:37 -0700)]
am "am
b71ac193: Merge "Don't run full-data backups when backup is disabled" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
7a361ce am
b71ac193: Merge "Don't run full-data backups when backup is disabled" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:24 +0000 (13:37 -0700)]
am "Initial Passpoint code."
merged from goog/mirror-m-wireless-internal-release
2eba02a Initial Passpoint code.
Vinit Deshpande [Sun, 15 Mar 2015 20:37:23 +0000 (13:37 -0700)]
am "am
d24047dc: Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
6ac612b am
d24047dc: Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:22 +0000 (13:37 -0700)]
am "am
9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
4cf958e am
9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:20 +0000 (13:37 -0700)]
am "am
dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
1742716 am
dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:19 +0000 (13:37 -0700)]
am "am
3f923474: Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
06c8608 am
3f923474: Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:18 +0000 (13:37 -0700)]
am "am
af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
364c0a3 am
af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:17 +0000 (13:37 -0700)]
am "am
5df10e18: Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
855f8a2 am
5df10e18: Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:16 +0000 (13:37 -0700)]
am "am
6efc3ac6: Merge "Allow ~Layer() to happen after onGLContextDestroyed" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
51a5391 am
6efc3ac6: Merge "Allow ~Layer() to happen after onGLContextDestroyed" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:15 +0000 (13:37 -0700)]
am "am
0312d2ff: am
320f505e: am
52fba8d1: am
88add689: am
a5ccca24: am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge:
ea63fd7 automerge:
bebfd58"
merged from goog/mirror-m-wireless-internal-release
aa72971 am
0312d2ff: am
320f505e: am
52fba8d1: am
88add689: am
a5ccca24: am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge:
ea63fd7 automerge:
bebfd58
Vinit Deshpande [Sun, 15 Mar 2015 20:37:14 +0000 (13:37 -0700)]
am "am
4c2a6fdd: (-s ours) am
64bdf77d: am
8bb65246: am
a43742ec: am
6813f29e: am
76cdbb04: (-s ours) am
d0318a63: am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge:
48dad94 -s ours automerge:
6fe42f0 -s ours"
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
Vinit Deshpande [Sun, 15 Mar 2015 20:37:13 +0000 (13:37 -0700)]
am "am
feabeb62: am
8b8d6195: am
9570e144: am
ea63fd7f: am
88add689: am
a5ccca24: am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev"
merged from goog/mirror-m-wireless-internal-release
f3bdb53 am
feabeb62: am
8b8d6195: am
9570e144: am
ea63fd7f: am
88add689: am
a5ccca24: am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:12 +0000 (13:37 -0700)]
am "am
51ea897f: (-s ours) am
470f3a98: am
0a63d817: am
48dad949: (-s ours) am
a43742ec: am
6813f29e: am
76cdbb04: (-s ours) am
d0318a63: am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev"
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
Vinit Deshpande [Sun, 15 Mar 2015 20:37:11 +0000 (13:37 -0700)]
am "am
95b85c15: (-s ours) am
9a2793e0: am
074c1116: am
64d6bacf: am
2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge:
7ab0ac6 -s ours automerge:
f8571c8a -s ours"
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
Vinit Deshpande [Sun, 15 Mar 2015 20:37:10 +0000 (13:37 -0700)]
am "am
f9c96522: (-s ours) am
6959a94f: am
336fc1ff: am
7ab0ac69: (-s ours) am
64d6bacf: am
2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev"
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
Vinit Deshpande [Sun, 15 Mar 2015 20:37:09 +0000 (13:37 -0700)]
am "am
8514766a: Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
e0bd21a am
8514766a: Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:37:08 +0000 (13:37 -0700)]
am "am
07600116: CEC: Ensure stable AVR connection"
merged from goog/mirror-m-wireless-internal-release
02d8d62 am
07600116: CEC: Ensure stable AVR connection
Vinit Deshpande [Sun, 15 Mar 2015 20:37:07 +0000 (13:37 -0700)]
am "am
2ee0d6f4: CEC: Stop ARC if hotplug event is asserted low"
merged from goog/mirror-m-wireless-internal-release
8d1f409 am
2ee0d6f4: CEC: Stop ARC if hotplug event is asserted low
OSDN Git Service
