Scott Main
8f5a76d2bf
am b4f96287: add latest Roboto fonts to DAC and update download links
...
* commit 'b4f96287285cd0886954d1576157b7a38995af88':
add latest Roboto fonts to DAC and update download links
2013-08-16 10:55:07 -07:00
Scott Main
b4f9628728
add latest Roboto fonts to DAC and update download links
...
Change-Id: I6232cf02486d5b82d503ebe8c6035a7da2a1093d
2013-08-16 10:41:31 -07:00
Roman Nurik
8ab80f1a02
am 1a5bb9d5: Update Typography design guide Bug: 6947941
...
* commit '1a5bb9d5cf13a2d2f9086926a7a020cfa08efd66':
Update Typography design guide Bug: 6947941
2013-08-14 11:21:45 -07:00
Roman Nurik
1a5bb9d5cf
Update Typography design guide
...
Bug: 6947941
Change-Id: I18a5c9cfd9de511c280d8aa7e410b5b9939c6774
2013-08-14 10:48:26 -07:00
Kenny Root
965eb25843
am 1c2cb653: am 999ddae7: am ae24c0d5: am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
...
* commit '1c2cb6533bfebf8b930850215e24327420e34a4b':
Use hostname verifier directly instead of instance
2013-08-13 17:57:10 -07:00
Kenny Root
1c2cb6533b
am 999ddae7: am ae24c0d5: am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
...
* commit '999ddae70360fc99e804d0b176af487582cd37c8':
Use hostname verifier directly instead of instance
2013-08-13 17:54:18 -07:00
Kenny Root
999ddae703
am ae24c0d5: am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
...
* commit 'ae24c0d539414805a6c979f9318d0765506221ae':
Use hostname verifier directly instead of instance
2013-08-13 17:51:15 -07:00
Kenny Root
ae24c0d539
am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
...
* commit 'bf15c7cecefba8fdb3070c389a4966f11a8d8656':
Use hostname verifier directly instead of instance
2013-08-13 17:48:20 -07:00
Kenny Root
bf15c7cece
am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
...
* commit 'dceda36b0052aca7a93a265ea6eb8e8fb71cd322':
Use hostname verifier directly instead of instance
2013-08-13 17:44:27 -07:00
Kenny Root
dceda36b00
am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
...
* commit '1c5e33d37dd4f8c68ccc16758e21572f193a8eb2':
Use hostname verifier directly instead of instance
2013-08-13 17:42:45 -07:00
Kenny Root
1c5e33d37d
am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
...
* commit '3bc3240ffb51358fa706099cfc5e120cf0f1b60d':
Use hostname verifier directly instead of instance
2013-08-13 17:36:42 -07:00
Kenny Root
3bc3240ffb
am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
...
* commit 'a6226a2d202619ddb7e3e9765a3dc9f20241f853':
Use hostname verifier directly instead of instance
2013-08-13 17:31:32 -07:00
Kenny Root
a6226a2d20
am 32c99004: Use hostname verifier directly instead of instance
...
* commit '32c990044f027542a034a7606cf010dca6df252f':
Use hostname verifier directly instead of instance
2013-08-13 17:27:49 -07:00
Kenny Root
32c990044f
Use hostname verifier directly instead of instance
...
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.
(cherry picked from commit 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)
Bug: 9984058
Change-Id: I56565afa0394dc98054abbaef06ac9bfff009e56
2013-08-13 14:13:08 -07:00
Kenny Root
61768c97d6
am 3870c570: Use hostname verifier directly instead of instance DO NOT MERGE
...
* commit '3870c570bbd438cefd09a061b9481314a15dd659':
Use hostname verifier directly instead of instance DO NOT MERGE
2013-08-13 11:41:11 -07:00
Kenny Root
3870c570bb
Use hostname verifier directly instead of instance DO NOT MERGE
...
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.
(cherry picked from commit 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)
Bug: 9984058
Change-Id: I79d8a934bfc390e4cd503fd592e21bc4e5446a7d
2013-08-13 11:00:10 -07:00
Scott Main
261e00cb04
am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later.
...
* commit 'b478b10f34a9fa9c6b42f54047eb9e77111a16c7':
Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
2013-08-13 10:57:31 -07:00
Katie McCormick
e50078961a
am e78b4f53: Doc change: collapse key fix... clean version of kmccormick\'s change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
...
* commit 'e78b4f53392d25eda4a121670aca518df9615f71':
Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
2013-08-12 12:18:45 -07:00
Katie McCormick
e78b4f5339
Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
...
Change-Id: I620150b14ecd59db05f40c4422f8e2d09e05ebcb
2013-08-12 12:07:26 -07:00
Scott Main
6dd38cc534
Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."
...
Submitted the original revert too soon.
This reverts commit ebcee19783c4fe5ba776353e95974383850a4685.
Change-Id: I7c76b9c37a8d919cdf319dae1ae8f444300ed3d4
2013-08-12 17:40:37 +00:00
Scott Main
ebcee19783
Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev"
...
revert to fix conflicts, i'll fix it all later.
This reverts commit 385bb2eb5184686c2d953fe4757522e61acb3392.
Change-Id: Ie0a995b185c3354ff369fce87f73810c1027a0b2
2013-08-12 17:08:28 +00:00
Scott Main
b478b10f34
Revert "Doc change: collapse key fix."
...
To resolve conflict. I'll fix it all later.
This reverts commit 53d9628d080aa7339b724a994607022c5386a566.
2013-08-12 09:57:24 -07:00
Katie McCormick
385bb2eb51
resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev
...
Change-Id: I3f0f4d210dd48ddbed5795278c7e2b5f07da5978
2013-08-09 17:55:05 -07:00
Katie McCormick
45178b1340
Merge "Doc change: collapse key fix." into jb-mr2-dev
2013-08-09 22:41:35 +00:00
Katie McCormick
53d9628d08
Doc change: collapse key fix.
...
Change-Id: I620150b14ecd59db05f40c4422f8e2d09e05ebcb
2013-08-09 15:32:23 -07:00
Wink Saville
02eab434ad
am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
...
* commit '4d87d91dfe886713df96abd3c0d1c9e20cf385e5':
If in a mobile captive portal is detected enable fail fast.
2013-08-08 15:43:24 -07:00
Wink Saville
55adb390bb
am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
...
* commit '35152f13b3302dbcb43345458dd5b8b092e37320':
Have CaptivePortalTracker use gservices updateable provisioning urls.
2013-08-08 15:43:13 -07:00
Wink Saville
b9b4321b75
am 5191b859: Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev
...
* commit '5191b8599011c255936e3a3cacc052c03e57b772':
In CaptiviePortalTracker a socket timeout is probably a captive portal.
2013-08-08 15:43:07 -07:00
Wink Saville
9b6363e5e6
am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev
...
* commit 'cbad1243ad901b8ffcb7497a8f440414b8d41898':
Check that hipri has started.
2013-08-08 15:43:00 -07:00
Wink Saville
4d87d91dfe
Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
2013-08-08 22:07:27 +00:00
Wink Saville
35152f13b3
Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
2013-08-08 22:06:21 +00:00
Wink Saville
5191b85990
Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev
2013-08-08 22:05:20 +00:00
Wink Saville
cbad1243ad
Merge "Check that hipri has started." into jb-mr2-dev
2013-08-08 22:03:45 +00:00
Joe Malin
93bb7bf22d
am 5986f497: Merge "Doc Change: Fix 10224981 error in code snippet" into jb-mr2-docs
...
* commit '5986f49751e563adf443baca589419e1eb9fbf84':
Doc Change: Fix 10224981 error in code snippet
2013-08-08 10:17:31 -07:00
Joe Malin
5986f49751
Merge "Doc Change: Fix 10224981 error in code snippet" into jb-mr2-docs
2013-08-08 17:12:02 +00:00
Joe Malin
81ea1eed82
Doc Change: Fix 10224981 error in code snippet
...
Change-Id: Ia8193989b0ab08f5b0888a4d3f6823018b48ab18
2013-08-07 16:43:52 -07:00
Wink Saville
d747cbc898
If in a mobile captive portal is detected enable fail fast.
...
When captive portal checking completes pass back the result.
This is used to enable/disable failing fast for mobile. When
failing fast is enabled we don't check for data stalls and thus
won't be continually trying to do recovery operations, such as
restarting the radio.
Bug: 9462512
Change-Id: I0dea0eee519f8ee7f94e79d40e82c18f30d7fe2e
2013-08-07 16:22:47 -07:00
Dianne Hackborn
9f11f105cd
am 7f09ec39: Fix issue #10226007 : Reset apps restores most of the changed settings...
...
* commit '7f09ec39b6fd7f24751f814649f12ea686cb28d4':
Fix issue #10226007 : Reset apps restores most of the changed settings...
2013-08-07 16:09:14 -07:00
Dianne Hackborn
7f09ec39b6
Fix issue #10226007 : Reset apps restores most of the changed settings...
...
...to original but not all modified ones
Very stupid mistakes in messing up the iteration when pruning op
entries.
Change-Id: Ie536b9095f797fcd2b86c9a386a72746796430d1
2013-08-07 15:49:02 -07:00
Wink Saville
7f6ee2ec90
Check that hipri has started.
...
I needed to test the result of startUsingNetworkFeature, otherwise
on mobile networks that are slow to come up, we won't detect
warm SIMs after booting.
Bug: 9962943
Change-Id: Ib638a4e43867ecaa85d6abff65643b77a63526b6
2013-08-07 11:02:57 -07:00
Joe Malin
72289702e5
am 6180f104: DOC CHANGE: Fixed bug 10210178
...
* commit '6180f104cf8c97316e77a4bbfd95992c2b7649cb':
DOC CHANGE: Fixed bug 10210178
2013-08-07 10:44:45 -07:00
Joe Malin
6180f104cf
DOC CHANGE: Fixed bug 10210178
...
Change-Id: If6e955ea287e66df20a441ab44e7bd4557645348
2013-08-07 09:53:09 -07:00
Scott Main
bdf85de3b8
am 7b60431b: update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. bug: 10207619
...
* commit '7b60431ba0f69e51b25e5bf92379222d8ef8691b':
update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. bug: 10207619
2013-08-06 15:30:41 -07:00
Scott Main
7b60431ba0
update <uses-feature> for OpenGL ES version with 3.0 example and API guide link.
...
bug: 10207619
Change-Id: Ia94b102f3c1476eb118c212de3246e735ffe57b6
2013-08-06 13:17:41 -07:00
Dirk Dougherty
1153eb46b3
am 4e847bd1: Doc change: fix federated urls.
...
* commit '4e847bd1f0c4e09f169603fde129e4433a3fe5bc':
Doc change: fix federated urls.
2013-08-06 10:46:37 -07:00
Dirk Dougherty
4e847bd1f0
Doc change: fix federated urls.
...
Change-Id: I29758362e81361a58d85ff8ec9e19d5c8da8da7d
2013-08-06 10:01:24 -07:00
Dirk Dougherty
8154d2932a
am 58c68d77: Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs
...
* commit '58c68d77596dc81ac6715c8bc7785d1cc430929f':
Doc change: Updated reference docs for Google Play Services 3.2.
2013-08-06 09:30:12 -07:00
Dirk Dougherty
58c68d7759
Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs
2013-08-06 07:35:28 +00:00
Xia Wang
ebbcc18eaa
am 4032217e: Merge "Add option for video playback test to accept media source path." into jb-mr2-dev
...
* commit '4032217ee939d3b23548e83d9183306d66af6f8f':
Add option for video playback test to accept media source path.
2013-08-05 15:54:41 -07:00
Xia Wang
4032217ee9
Merge "Add option for video playback test to accept media source path." into jb-mr2-dev
2013-08-05 22:51:03 +00:00