OSDN Git Service
Vinit Deshpande [Sun, 15 Mar 2015 20:42:43 +0000 (13:42 -0700)]
am "am
498691d2: am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs automerge:
5890742"
merged from goog/mirror-m-wireless-internal-release
6657dd3 am
498691d2: am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs automerge:
5890742
Vinit Deshpande [Sun, 15 Mar 2015 20:42:42 +0000 (13:42 -0700)]
am "am
498691d2: am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
5890742 am
498691d2: am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:42:41 +0000 (13:42 -0700)]
am "am
4eedcceb: Merge "Merge commit '
83a63bac' into manualmerge" into lmp-mr1-dev automerge:
3797ee9"
merged from goog/mirror-m-wireless-internal-release
7ddec30 am
4eedcceb: Merge "Merge commit '
83a63bac' into manualmerge" into lmp-mr1-dev automerge:
3797ee9
Vinit Deshpande [Sun, 15 Mar 2015 20:42:40 +0000 (13:42 -0700)]
am "am
4eedcceb: Merge "Merge commit '
83a63bac' into manualmerge" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
3797ee9 am
4eedcceb: Merge "Merge commit '
83a63bac' into manualmerge" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:42:38 +0000 (13:42 -0700)]
am "add 2 side RTT support on scan"
merged from goog/mirror-m-wireless-internal-release
6e58424 add 2 side RTT support on scan
Vinit Deshpande [Sun, 15 Mar 2015 20:42:37 +0000 (13:42 -0700)]
am "am
c974ac11: MediaProjectionPermissionActivity: Fix NPE. automerge:
d3c532e"
merged from goog/mirror-m-wireless-internal-release
73cb967 am
c974ac11: MediaProjectionPermissionActivity: Fix NPE. automerge:
d3c532e
Vinit Deshpande [Sun, 15 Mar 2015 20:42:36 +0000 (13:42 -0700)]
am "am
c974ac11: MediaProjectionPermissionActivity: Fix NPE."
merged from goog/mirror-m-wireless-internal-release
d3c532e am
c974ac11: MediaProjectionPermissionActivity: Fix NPE.
Vinit Deshpande [Sun, 15 Mar 2015 20:42:35 +0000 (13:42 -0700)]
am "am
246a3a4a: am
14fcef3b: am
c4418980: am
a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs automerge:
9a447bc"
merged from goog/mirror-m-wireless-internal-release
2782f31 am
246a3a4a: am
14fcef3b: am
c4418980: am
a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs automerge:
9a447bc
Vinit Deshpande [Sun, 15 Mar 2015 20:42:34 +0000 (13:42 -0700)]
am "am
a81ed3cd: docs: support library updates for sdk 22 automerge:
7a3dc08"
merged from goog/mirror-m-wireless-internal-release
2444690 am
a81ed3cd: docs: support library updates for sdk 22 automerge:
7a3dc08
Vinit Deshpande [Sun, 15 Mar 2015 20:42:33 +0000 (13:42 -0700)]
am "am
e0ce0f2c: docs: platform revisions 5.1 automerge:
7de9d3b"
merged from goog/mirror-m-wireless-internal-release
c3b5768 am
e0ce0f2c: docs: platform revisions 5.1 automerge:
7de9d3b
Vinit Deshpande [Sun, 15 Mar 2015 20:42:32 +0000 (13:42 -0700)]
am "am
54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev automerge:
a5587b9"
merged from goog/mirror-m-wireless-internal-release
63751cf am
54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev automerge:
a5587b9
Vinit Deshpande [Sun, 15 Mar 2015 20:42:31 +0000 (13:42 -0700)]
am "am
2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev automerge:
0a1d5ca"
merged from goog/mirror-m-wireless-internal-release
91572ab am
2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev automerge:
0a1d5ca
Vinit Deshpande [Sun, 15 Mar 2015 20:42:30 +0000 (13:42 -0700)]
am "am
3f3f842c: am
d54fe112: am
2cbda290: am
69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs automerge:
b068c14"
merged from goog/mirror-m-wireless-internal-release
0764a8b am
3f3f842c: am
d54fe112: am
2cbda290: am
69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs automerge:
b068c14
Vinit Deshpande [Sun, 15 Mar 2015 20:42:29 +0000 (13:42 -0700)]
am "am
45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev automerge:
287f257"
merged from goog/mirror-m-wireless-internal-release
6e3276c am
45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev automerge:
287f257
Vinit Deshpande [Sun, 15 Mar 2015 20:42:28 +0000 (13:42 -0700)]
am "am
5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev automerge:
622c011"
merged from goog/mirror-m-wireless-internal-release
46d48f9 am
5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev automerge:
622c011
Vinit Deshpande [Sun, 15 Mar 2015 20:42:27 +0000 (13:42 -0700)]
am "am
246a3a4a: am
14fcef3b: am
c4418980: am
a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
9a447bc am
246a3a4a: am
14fcef3b: am
c4418980: am
a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:42:25 +0000 (13:42 -0700)]
am "am
a81ed3cd: docs: support library updates for sdk 22"
merged from goog/mirror-m-wireless-internal-release
7a3dc08 am
a81ed3cd: docs: support library updates for sdk 22
Vinit Deshpande [Sun, 15 Mar 2015 20:42:24 +0000 (13:42 -0700)]
am "am
e0ce0f2c: docs: platform revisions 5.1"
merged from goog/mirror-m-wireless-internal-release
7de9d3b am
e0ce0f2c: docs: platform revisions 5.1
Vinit Deshpande [Sun, 15 Mar 2015 20:42:23 +0000 (13:42 -0700)]
am "am
54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
a5587b9 am
54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:42:22 +0000 (13:42 -0700)]
am "am
2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
0a1d5ca am
2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:42:21 +0000 (13:42 -0700)]
am "am
3f3f842c: am
d54fe112: am
2cbda290: am
69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
b068c14 am
3f3f842c: am
d54fe112: am
2cbda290: am
69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs
Vinit Deshpande [Sun, 15 Mar 2015 20:42:20 +0000 (13:42 -0700)]
am "am
45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
287f257 am
45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:42:19 +0000 (13:42 -0700)]
am "am
5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
622c011 am
5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:42:17 +0000 (13:42 -0700)]
am "Correct "Sign-in" and "Sign into" to "Sign in to"."
merged from goog/mirror-m-wireless-internal-release
44f7239 Correct "Sign-in" and "Sign into" to "Sign in to".
Vinit Deshpande [Sun, 15 Mar 2015 20:42:16 +0000 (13:42 -0700)]
am "Merge "Refactor NetworkUtils interaction with DHCP." into m-wireless-dev"
merged from goog/mirror-m-wireless-internal-release
46bdfa9 Merge "Refactor NetworkUtils interaction with DHCP." into m-wireless-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:42:15 +0000 (13:42 -0700)]
am "am
bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev automerge:
4322c8d"
merged from goog/mirror-m-wireless-internal-release
335b59f am
bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev automerge:
4322c8d
Vinit Deshpande [Sun, 15 Mar 2015 20:42:14 +0000 (13:42 -0700)]
am "am
bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
4322c8d am
bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:42:13 +0000 (13:42 -0700)]
am "am
f2c1c096: am
6ed9b75a: am
72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev automerge:
2b24d07"
merged from goog/mirror-m-wireless-internal-release
969b027 am
f2c1c096: am
6ed9b75a: am
72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev automerge:
2b24d07
Vinit Deshpande [Sun, 15 Mar 2015 20:42:12 +0000 (13:42 -0700)]
am "am
2022b0ff: am
d003e813: am
369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev automerge:
5e84b29"
merged from goog/mirror-m-wireless-internal-release
e99bef0 am
2022b0ff: am
d003e813: am
369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev automerge:
5e84b29
Vinit Deshpande [Sun, 15 Mar 2015 20:42:11 +0000 (13:42 -0700)]
am "am
aff0ec93: am
81449b2c: am
10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev automerge:
ab02793"
merged from goog/mirror-m-wireless-internal-release
b2c8848 am
aff0ec93: am
81449b2c: am
10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev automerge:
ab02793
Vinit Deshpande [Sun, 15 Mar 2015 20:42:02 +0000 (13:42 -0700)]
am "Update API."
merged from goog/mirror-m-wireless-internal-release
3ec7681 Update API.
Change-Id: Id4a08ee8e55cd4f5e8182a38d4855be80d452090
Vinit Deshpande [Sun, 15 Mar 2015 20:41:31 +0000 (13:41 -0700)]
am "Add frameworks classes and methods necessary for VVM syncadapter structure."
merged from goog/mirror-m-wireless-internal-release
7c07dfa Add frameworks classes and methods necessary for VVM syncadapter structure.
Vinit Deshpande [Sun, 15 Mar 2015 20:41:25 +0000 (13:41 -0700)]
am "Add PHONE_ACCOUNT_ADDRESS to the call log DB."
merged from goog/mirror-m-wireless-internal-release
204f80e Add PHONE_ACCOUNT_ADDRESS to the call log DB.
Change-Id: I363403bf73b202f03b3f706a823b0f142183a695
Vinit Deshpande [Sun, 15 Mar 2015 20:41:14 +0000 (13:41 -0700)]
am "Revert "Add PHONE_ACCOUNT_ADDRESS to the call log DB.""
merged from goog/mirror-m-wireless-internal-release
da35a2b Revert "Add PHONE_ACCOUNT_ADDRESS to the call log DB."
Change-Id: I4dc4865d58e4b68858c7767f201e267a72dc236b
Vinit Deshpande [Sun, 15 Mar 2015 20:41:04 +0000 (13:41 -0700)]
am "Add PHONE_ACCOUNT_ADDRESS to the call log DB."
merged from goog/mirror-m-wireless-internal-release
40c6f2b Add PHONE_ACCOUNT_ADDRESS to the call log DB.
Change-Id: I91b487137a2da621b496bf5f135fe19bb0a6ca62
Vinit Deshpande [Sun, 15 Mar 2015 20:40:57 +0000 (13:40 -0700)]
am "Changed package name of a Telecom service"
merged from goog/mirror-m-wireless-internal-release
c4959ab Changed package name of a Telecom service
Vinit Deshpande [Sun, 15 Mar 2015 20:40:55 +0000 (13:40 -0700)]
am "Small update to PhoneAccountHandle ID javadoc."
merged from goog/mirror-m-wireless-internal-release
b7bb8c4 Small update to PhoneAccountHandle ID javadoc.
Vinit Deshpande [Sun, 15 Mar 2015 20:40:54 +0000 (13:40 -0700)]
am "Merge "Add multi-SIM fields to VoicemailContract.Status." into m-wireless-dev"
merged from goog/mirror-m-wireless-internal-release
4eddc11 Merge "Add multi-SIM fields to VoicemailContract.Status." into m-wireless-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:40:53 +0000 (13:40 -0700)]
am "Merge "Add Sub-ID-from-phone-account converter method." into m-wireless-dev"
merged from goog/mirror-m-wireless-internal-release
e28ad78 Merge "Add Sub-ID-from-phone-account converter method." into m-wireless-dev
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
OSDN Git Service
