OSDN Git Service
Vinit Deshpande [Sun, 15 Mar 2015 20:40:52 +0000 (13:40 -0700)]
am "Merge "Unhide and rename PhoneNumberUtils tts methods" into m-wireless-dev"
merged from goog/mirror-m-wireless-internal-release
bf443f9 Merge "Unhide and rename PhoneNumberUtils tts methods" into m-wireless-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:40:51 +0000 (13:40 -0700)]
am "Merge "Unhide telecom APIs needed by Contacts" into m-wireless-dev"
merged from goog/mirror-m-wireless-internal-release
24ab1e4 Merge "Unhide telecom APIs needed by Contacts" into m-wireless-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:40:50 +0000 (13:40 -0700)]
am "am
f2c1c096: am
6ed9b75a: am
72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev"
merged from goog/mirror-m-wireless-internal-release
2b24d07 am
f2c1c096: am
6ed9b75a: am
72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:40:49 +0000 (13:40 -0700)]
am "am
2022b0ff: am
d003e813: am
369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev"
merged from goog/mirror-m-wireless-internal-release
5e84b29 am
2022b0ff: am
d003e813: am
369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:40:48 +0000 (13:40 -0700)]
am "am
aff0ec93: am
81449b2c: am
10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev"
merged from goog/mirror-m-wireless-internal-release
ab02793 am
aff0ec93: am
81449b2c: am
10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:40:47 +0000 (13:40 -0700)]
am "am
07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
c92fa1f am
07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:40:45 +0000 (13:40 -0700)]
am "Add multi-SIM fields to VoicemailContract.Status."
merged from goog/mirror-m-wireless-internal-release
109dabd Add multi-SIM fields to VoicemailContract.Status.
Vinit Deshpande [Sun, 15 Mar 2015 20:40:43 +0000 (13:40 -0700)]
am "Add Sub-ID-from-phone-account converter method."
merged from goog/mirror-m-wireless-internal-release
9b09c15 Add Sub-ID-from-phone-account converter method.
Vinit Deshpande [Sun, 15 Mar 2015 20:40:42 +0000 (13:40 -0700)]
am "am
8243b74f: am
6a0c8084: am
9b94a539: am
97a1173b: docs: March 2015 Dashboard update"
merged from goog/mirror-m-wireless-internal-release
d186768 am
8243b74f: am
6a0c8084: am
9b94a539: am
97a1173b: docs: March 2015 Dashboard update
Vinit Deshpande [Sun, 15 Mar 2015 20:40:36 +0000 (13:40 -0700)]
am "Unhide and rename PhoneNumberUtils tts methods"
merged from goog/mirror-m-wireless-internal-release
57f8f0d Unhide and rename PhoneNumberUtils tts methods
Change-Id: I72ddd3c38b69a7354564e5d1a1ae2d20330f6f2b
Vinit Deshpande [Sun, 15 Mar 2015 20:40:28 +0000 (13:40 -0700)]
am "Unhide telecom APIs needed by Contacts"
merged from goog/mirror-m-wireless-internal-release
48d8442 Unhide telecom APIs needed by Contacts
Vinit Deshpande [Sun, 15 Mar 2015 20:40:27 +0000 (13:40 -0700)]
am "Refactor NetworkUtils interaction with DHCP."
merged from goog/mirror-m-wireless-internal-release
3c3ce17 Refactor NetworkUtils interaction with DHCP.
Vinit Deshpande [Sun, 15 Mar 2015 20:40:26 +0000 (13:40 -0700)]
am "am
37f207e1: am
191131d4: am
50e8b020: am
a83f6445: Merge "docs: gradle plugin version update" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
500a98a am
37f207e1: am
191131d4: am
50e8b020: am
a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:40:24 +0000 (13:40 -0700)]
am "am
dedba01a: am
d57871e0: am
8aa8960e: am
a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
9036eeb am
dedba01a: am
d57871e0: am
8aa8960e: am
a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:40:23 +0000 (13:40 -0700)]
am "am
d4cdf18e: am
b8593133: am
c1120b45: am
8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
8f7c837 am
d4cdf18e: am
b8593133: am
c1120b45: am
8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:40:22 +0000 (13:40 -0700)]
am "am
3a5b0815: am
3daee377: am
7f26f2b9: am
b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal"
merged from goog/mirror-m-wireless-internal-release
db10642 am
3a5b0815: am
3daee377: am
7f26f2b9: am
b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
Vinit Deshpande [Sun, 15 Mar 2015 20:40:21 +0000 (13:40 -0700)]
am "Merge "Separate NAT from forwarding." into lmp-mr1-wfc-dev"
merged from goog/mirror-m-wireless-internal-release
73b0048 Merge "Separate NAT from forwarding." into lmp-mr1-wfc-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:40:20 +0000 (13:40 -0700)]
am "Separate NAT from forwarding."
merged from goog/mirror-m-wireless-internal-release
35e36db Separate NAT from forwarding.
Vinit Deshpande [Sun, 15 Mar 2015 20:40:19 +0000 (13:40 -0700)]
am "Merge "Append forwarder name to ipfwd command" into lmp-mr1-wfc-dev"
merged from goog/mirror-m-wireless-internal-release
42ad7b5 Merge "Append forwarder name to ipfwd command" into lmp-mr1-wfc-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:40:17 +0000 (13:40 -0700)]
am "am
025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
8b76495 am
025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:40:16 +0000 (13:40 -0700)]
am "am
9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
2db6e09 am
9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:40:15 +0000 (13:40 -0700)]
am "am
328dc428: am
6bb23d62: am
29936684: am
0a504745: Merge "docs: 9patch tool update" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
8472a74 am
328dc428: am
6bb23d62: am
29936684: am
0a504745: Merge "docs: 9patch tool update" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:40:04 +0000 (13:40 -0700)]
am "Telephony: Implementation for IWLAN."
merged from goog/mirror-m-wireless-internal-release
bece926 Telephony: Implementation for IWLAN.
Change-Id: I4d55b3452428ebf9fbcfc3ba3a75cefcb2aeb0cf
Vinit Deshpande [Sun, 15 Mar 2015 20:39:44 +0000 (13:39 -0700)]
am "am
bd409177: am
1836eea0: am
41104632: am
eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
3882afb am
bd409177: am
1836eea0: am
41104632: am
eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:39:43 +0000 (13:39 -0700)]
am "am
81049aff: am
f8a95b0b: am
84994e87: am
db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
8451fef am
81049aff: am
f8a95b0b: am
84994e87: am
db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:39:42 +0000 (13:39 -0700)]
am "Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev"
merged from goog/mirror-m-wireless-internal-release
a357b5a Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:39:41 +0000 (13:39 -0700)]
am "Merge "Passpoint API - Take 1" into m-wireless-wifi-dev"
merged from goog/mirror-m-wireless-internal-release
c4423a5 Merge "Passpoint API - Take 1" into m-wireless-wifi-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:39:40 +0000 (13:39 -0700)]
am "am
b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
04d3e55 am
b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:39:39 +0000 (13:39 -0700)]
am "am
8ffb574a: am
f7224396: am
c427b721: am
41418826: Merge "docs: Android for Work developer landing page" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
e084c48 am
8ffb574a: am
f7224396: am
c427b721: am
41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:39:38 +0000 (13:39 -0700)]
am "am
7391b0a1: am
e64301e6: am
790b1bc8: am
d3cd0948: docs: New doc for creating an AfW Work Policy Controller"
merged from goog/mirror-m-wireless-internal-release
504d8c7 am
7391b0a1: am
e64301e6: am
790b1bc8: am
d3cd0948: docs: New doc for creating an AfW Work Policy Controller
Vinit Deshpande [Sun, 15 Mar 2015 20:39:37 +0000 (13:39 -0700)]
am "am
93df7f07: am
032e931a: am
6ffe1058: am
a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
da34160 am
93df7f07: am
032e931a: am
6ffe1058: am
a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:39:36 +0000 (13:39 -0700)]
am "am
7fc5b5a1: am
a9ad0fc7: am
f2525ed3: am
ea2a0648: Explain behavior of boundless ripple projection"
merged from goog/mirror-m-wireless-internal-release
92e587b am
7fc5b5a1: am
a9ad0fc7: am
f2525ed3: am
ea2a0648: Explain behavior of boundless ripple projection
Vinit Deshpande [Sun, 15 Mar 2015 20:39:33 +0000 (13:39 -0700)]
am "Passpoint API - Take 1"
merged from goog/mirror-m-wireless-internal-release
b21d248 Passpoint API - Take 1
Vinit Deshpande [Sun, 15 Mar 2015 20:39:32 +0000 (13:39 -0700)]
am "Append forwarder name to ipfwd command"
merged from goog/mirror-m-wireless-internal-release
f3d4a58 Append forwarder name to ipfwd command
Vinit Deshpande [Sun, 15 Mar 2015 20:39:30 +0000 (13:39 -0700)]
am "Do not provide 5GHz option for softap if there is no country code available"
merged from goog/mirror-m-wireless-internal-release
b938c0e Do not provide 5GHz option for softap if there is no country code available
Vinit Deshpande [Sun, 15 Mar 2015 20:39:29 +0000 (13:39 -0700)]
am "am
99142d29: am
3f8e2b93: am
30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev"
merged from goog/mirror-m-wireless-internal-release
538987d am
99142d29: am
3f8e2b93: am
30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:39:28 +0000 (13:39 -0700)]
am "am
3570268b: am
09e9076d: am
ab0f8ff7: am
88e0145f: Merge "Fixes several typos." into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
c586697 am
3570268b: am
09e9076d: am
ab0f8ff7: am
88e0145f: Merge "Fixes several typos." into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:39:26 +0000 (13:39 -0700)]
am "am
f066c235: am
18c8a35f: am
8e604689: am
3c26756a: Merge "Update Google Play brand-info page. Bug:
18257984" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
85fbd27 am
f066c235: am
18c8a35f: am
8e604689: am
3c26756a: Merge "Update Google Play brand-info page. Bug:
18257984" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:39:25 +0000 (13:39 -0700)]
am "am
aba93780: am
5b60b1a0: am
a91f6d00: am
4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
552313c am
aba93780: am
5b60b1a0: am
a91f6d00: am
4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:39:24 +0000 (13:39 -0700)]
am "Introduce onLost event on bssid hotlist [DO NOT MERGE]"
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
Vinit Deshpande [Sun, 15 Mar 2015 20:39:23 +0000 (13:39 -0700)]
am "am
677a1754: am
969848c4: am
f900a1f4: am
81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
7dca346 am
677a1754: am
969848c4: am
f900a1f4: am
81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:39:22 +0000 (13:39 -0700)]
am "am
26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
3280f3d am
26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:39:21 +0000 (13:39 -0700)]
am "am
bb1c03e9: am
a4fce24d: am
e16f4393: am
506cba8b: Doc Update: fixed unescaped angle brackets in code snippets."
merged from goog/mirror-m-wireless-internal-release
a58caad am
bb1c03e9: am
a4fce24d: am
e16f4393: am
506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
Vinit Deshpande [Sun, 15 Mar 2015 20:39:20 +0000 (13:39 -0700)]
am "am
7319ea27: am
cc883a1f: am
1e0face2: am
b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
ffc28af am
7319ea27: am
cc883a1f: am
1e0face2: am
b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:39:19 +0000 (13:39 -0700)]
am "am
73cd35f2: am
f213a8c9: am
14bb9188: am
f4f059d4: docs: studio 1.1 downloads"
merged from goog/mirror-m-wireless-internal-release
65aac24 am
73cd35f2: am
f213a8c9: am
14bb9188: am
f4f059d4: docs: studio 1.1 downloads
Vinit Deshpande [Sun, 15 Mar 2015 20:39:18 +0000 (13:39 -0700)]
am "am
3dfd6389: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
bb950cb am
3dfd6389: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:39:17 +0000 (13:39 -0700)]
am "am
c9b5f98b: am
6f5d4bd8: am
de91b384: am
e385672c: docs: remove reference to GCM doc from C2DM doc"
merged from goog/mirror-m-wireless-internal-release
04cfeb3 am
c9b5f98b: am
6f5d4bd8: am
de91b384: am
e385672c: docs: remove reference to GCM doc from C2DM doc
Vinit Deshpande [Sun, 15 Mar 2015 20:39:16 +0000 (13:39 -0700)]
am "am
0181b76b: (-s ours) am
bb4d0676: am
494d5b77: Merge "Check that bitmap's size does not exceed 32 bits. DO NOT MERGE" into lmp-dev"
merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed
Vinit Deshpande [Sun, 15 Mar 2015 20:39:14 +0000 (13:39 -0700)]
am "Rename from VoWIFI to WIFI."
merged from goog/mirror-m-wireless-internal-release
1a8ae3e Rename from VoWIFI to WIFI.
Vinit Deshpande [Sun, 15 Mar 2015 20:39:13 +0000 (13:39 -0700)]
am "WFC configuration: add carrier and device support configurations."
merged from goog/mirror-m-wireless-internal-release
9c8f21b WFC configuration: add carrier and device support configurations.
Vinit Deshpande [Sun, 15 Mar 2015 20:39:12 +0000 (13:39 -0700)]
am "am
cd9c0cab: am
708959b5: am
755c5d88: am
56375d90: docs: lint inspection updates"
merged from goog/mirror-m-wireless-internal-release
f04e8a2 am
cd9c0cab: am
708959b5: am
755c5d88: am
56375d90: docs: lint inspection updates
Vinit Deshpande [Sun, 15 Mar 2015 20:39:11 +0000 (13:39 -0700)]
am "am
129ea76a: Fix wifi AP backup"
merged from goog/mirror-m-wireless-internal-release
0c23e18 am
129ea76a: Fix wifi AP backup
Vinit Deshpande [Sun, 15 Mar 2015 20:39:09 +0000 (13:39 -0700)]
am "am
bd1fb402: am
e0f61e1c: am
717b4d13: Merge "docs: note to install linux packages" into lmp-docs automerge:
0f60943"
merged from goog/mirror-m-wireless-internal-release
47fb4d5 am
bd1fb402: am
e0f61e1c: am
717b4d13: Merge "docs: note to install linux packages" into lmp-docs automerge:
0f60943
Vinit Deshpande [Sun, 15 Mar 2015 20:39:08 +0000 (13:39 -0700)]
am "am
f82c88e2: am
c48e9bde: am
9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs automerge:
5f31276"
merged from goog/mirror-m-wireless-internal-release
3b9921c am
f82c88e2: am
c48e9bde: am
9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs automerge:
5f31276
Vinit Deshpande [Sun, 15 Mar 2015 20:39:07 +0000 (13:39 -0700)]
am "am
4eb14e02: am
d4c63b98: am
fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs automerge:
8d5ba01"
merged from goog/mirror-m-wireless-internal-release
8e1032a am
4eb14e02: am
d4c63b98: am
fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs automerge:
8d5ba01
Vinit Deshpande [Sun, 15 Mar 2015 20:39:06 +0000 (13:39 -0700)]
am "am
dcf68e83: am
d75a6833: am
099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge:
d225cfc"
merged from goog/mirror-m-wireless-internal-release
f173470 am
dcf68e83: am
d75a6833: am
099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge:
d225cfc
Vinit Deshpande [Sun, 15 Mar 2015 20:39:05 +0000 (13:39 -0700)]
am "am
502f303c: am
d72bea9d: am
40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge:
797c989"
merged from goog/mirror-m-wireless-internal-release
872efa6 am
502f303c: am
d72bea9d: am
40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge:
797c989
Vinit Deshpande [Sun, 15 Mar 2015 20:39:04 +0000 (13:39 -0700)]
am "am
6cdde671: am
43fb9e42: am
3c3b780c: Merge "docs: studio mipmap update" into lmp-docs automerge:
c694604"
merged from goog/mirror-m-wireless-internal-release
0c4496e am
6cdde671: am
43fb9e42: am
3c3b780c: Merge "docs: studio mipmap update" into lmp-docs automerge:
c694604
Vinit Deshpande [Sun, 15 Mar 2015 20:39:03 +0000 (13:39 -0700)]
am "am
ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
d0e4004 am
ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:39:02 +0000 (13:39 -0700)]
am "am
a94e4297: (-s ours) Merge "Do not make ActivityContainer available to apps. 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:39:01 +0000 (13:39 -0700)]
am "am
d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
12c2d3f am
d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:39:00 +0000 (13:39 -0700)]
am "am
d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
bed5a61 am
d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:38:59 +0000 (13:38 -0700)]
am "am
82510fa5: am
9c9a3afb: am
8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge:
fa40f00"
merged from goog/mirror-m-wireless-internal-release
6490ad4 am
82510fa5: am
9c9a3afb: am
8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge:
fa40f00
Vinit Deshpande [Sun, 15 Mar 2015 20:38:58 +0000 (13:38 -0700)]
am "am
2a6bf82e: am
533149d5: am
fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge:
a40eb5d"
merged from goog/mirror-m-wireless-internal-release
c987508 am
2a6bf82e: am
533149d5: am
fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge:
a40eb5d
Vinit Deshpande [Sun, 15 Mar 2015 20:38:57 +0000 (13:38 -0700)]
am "am
dbb32faf: am
8c124744: am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge:
bff1545"
merged from goog/mirror-m-wireless-internal-release
e343c3c am
dbb32faf: am
8c124744: am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge:
bff1545
Vinit Deshpande [Sun, 15 Mar 2015 20:38:56 +0000 (13:38 -0700)]
am "am
2d43b730: am
d2856643: am
4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge:
cb73fb9"
merged from goog/mirror-m-wireless-internal-release
b4f8092 am
2d43b730: am
d2856643: am
4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge:
cb73fb9
Vinit Deshpande [Sun, 15 Mar 2015 20:38:55 +0000 (13:38 -0700)]
am "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
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
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
OSDN Git Service
