OSDN Git Service
Etan Cohen [Mon, 13 Jul 2015 18:16:39 +0000 (18:16 +0000)]
am
c09544bb: Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev
* commit '
c09544bb88ada53494d4a955d0450a22985b4799':
Fix filter on CONNECTIVITY_ACTION updates
Amith Yamasani [Mon, 13 Jul 2015 18:16:32 +0000 (18:16 +0000)]
am
1578357d: Merge "Check user state after clearing identity." into mnc-dev
* commit '
1578357df737296aa151c6934fe7dd749a43ae15':
Check user state after clearing identity.
Etan Cohen [Mon, 13 Jul 2015 18:04:38 +0000 (18:04 +0000)]
Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev
Amith Yamasani [Mon, 13 Jul 2015 18:03:18 +0000 (18:03 +0000)]
Merge "Check user state after clearing identity." into mnc-dev
Chris Wren [Mon, 13 Jul 2015 17:53:08 +0000 (17:53 +0000)]
am
208934ff: Merge "fix build by restoring deleted enum" into mnc-dev
* commit '
208934ff010cc2aff7d8fee9237d6cee0e5bb563':
fix build by restoring deleted enum
Julia Reynolds [Mon, 13 Jul 2015 17:43:59 +0000 (17:43 +0000)]
am
fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev
* commit '
fbd0a444e787c93ee8ef8741fcf24826a8619fcb':
Remove personal/device group from sideloading screen.
Chris Wren [Mon, 13 Jul 2015 17:41:48 +0000 (17:41 +0000)]
Merge "fix build by restoring deleted enum" into mnc-dev
Julia Reynolds [Mon, 13 Jul 2015 17:34:10 +0000 (17:34 +0000)]
Merge "Remove personal/device group from sideloading screen." into mnc-dev
Chris Wren [Mon, 13 Jul 2015 16:59:01 +0000 (12:59 -0400)]
fix build by restoring deleted enum
Bug:
21114836
Change-Id: Ied4a6e48c66f882f43343a21bce0b3ccccd81713
Jason Monk [Mon, 13 Jul 2015 16:32:32 +0000 (16:32 +0000)]
am
28a07ff0: Merge "Fix demo mode issues" into mnc-dev
* commit '
28a07ff0e1bf6029653ceaaa7bbfae0080ee05d7':
Fix demo mode issues
Chris Wren [Mon, 13 Jul 2015 16:32:25 +0000 (16:32 +0000)]
am
4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev
* commit '
4502bfb8fd5ddb15bf0cc9bfc631eda269621f29':
add new enums to MetricsConstans
Jason Monk [Mon, 13 Jul 2015 16:32:19 +0000 (16:32 +0000)]
am
59b1dfef: Merge "Show volume restriction toast on all users" into mnc-dev
* commit '
59b1dfef62a041920f36c8e3e376d38facdd9c8d':
Show volume restriction toast on all users
Jason Monk [Mon, 13 Jul 2015 16:22:35 +0000 (16:22 +0000)]
Merge "Fix demo mode issues" into mnc-dev
Chris Wren [Mon, 13 Jul 2015 16:21:21 +0000 (16:21 +0000)]
Merge "add new enums to MetricsConstans" into mnc-dev
Jason Monk [Mon, 13 Jul 2015 16:21:00 +0000 (16:21 +0000)]
Merge "Show volume restriction toast on all users" into mnc-dev
Geoff Mendal [Mon, 13 Jul 2015 15:52:25 +0000 (15:52 +0000)]
am
c021aaaf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
c021aaaf6bd085d7332a33232e8118bab50ecc1f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:37:09 +0000 (15:37 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 13 Jul 2015 15:34:33 +0000 (10:34 -0500)]
Import translations. DO NOT MERGE
Change-Id: Idab7fc2dc586c8544d17263428c5556929303a64
Auto-generated-cl: translation import
Neil Fuller [Mon, 13 Jul 2015 15:27:31 +0000 (15:27 +0000)]
am
3ecbca50: am
886630c0: Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown."
* commit '
3ecbca5081f26ca03ef6b8b68767753343e67f38':
Switch shutdownInput / shutdownOutput to using Os.shutdown.
Neil Fuller [Mon, 13 Jul 2015 15:11:11 +0000 (15:11 +0000)]
am
886630c0: Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown."
* commit '
886630c0d8adc17c494edf19a30b06473a687fcb':
Switch shutdownInput / shutdownOutput to using Os.shutdown.
Jason Monk [Mon, 13 Jul 2015 15:02:13 +0000 (11:02 -0400)]
Show volume restriction toast on all users
Bug:
21642285
Change-Id: I18ed4036543e1f13cd3010b9e1d790b16aa8e7a0
Neil Fuller [Mon, 13 Jul 2015 15:02:04 +0000 (15:02 +0000)]
Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown."
Jason Monk [Mon, 13 Jul 2015 14:42:23 +0000 (10:42 -0400)]
Fix demo mode issues
Bug:
22387423
Change-Id: I7b0b4ca75bae12a9fb3a90ab804b263e8d982b46
Rubin Xu [Mon, 13 Jul 2015 14:06:04 +0000 (14:06 +0000)]
am
cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev
* commit '
cf9aebf138a3ec07277b1e5564751d2396a155c0':
Remove ExternalStorageFormatter
Rubin Xu [Mon, 13 Jul 2015 13:55:51 +0000 (13:55 +0000)]
Merge "Remove ExternalStorageFormatter" into mnc-dev
Julia Reynolds [Thu, 9 Jul 2015 19:23:42 +0000 (15:23 -0400)]
Remove personal/device group from sideloading screen.
Also ignore the requestedPermissionFlags of yet to be installed
packages when trying to determine if a permission is new.
Bug:
22229417
Change-Id: I59d579cdc42d64bcfdefdb06e1576959355bb7a4
Esteban Talavera [Mon, 13 Jul 2015 10:15:06 +0000 (10:15 +0000)]
am
0ec43f89: Merge "Use correct user when filtering app link candidates" into mnc-dev
* commit '
0ec43f89d2fc7064e7b42b40b318bef15fb040b5':
Use correct user when filtering app link candidates
Esteban Talavera [Mon, 13 Jul 2015 10:14:58 +0000 (10:14 +0000)]
am
22921603: Merge "Don\'t send app links to parent profile if status == never" into mnc-dev
* commit '
2292160320f29144f8f8f38bd6936e9f1efb4ae5':
Don't send app links to parent profile if status == never
Esteban Talavera [Mon, 13 Jul 2015 09:48:45 +0000 (09:48 +0000)]
Merge "Use correct user when filtering app link candidates" into mnc-dev
Esteban Talavera [Mon, 13 Jul 2015 09:48:18 +0000 (09:48 +0000)]
Merge "Don't send app links to parent profile if status == never" into mnc-dev
Billy Lau [Mon, 13 Jul 2015 07:21:51 +0000 (07:21 +0000)]
am
96d00ab3: Merge "Bug:
21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
* commit '
96d00ab359d60197321f06b4feb3d01f3fa03a29':
Bug:
21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
Zhijun He [Mon, 13 Jul 2015 07:21:44 +0000 (07:21 +0000)]
am
4fb81253: Camera metadata: fix typos.
* commit '
4fb81253edc726936d4b71b7e9c0789cab45e9da':
Camera metadata: fix typos.
Geoff Mendal [Mon, 13 Jul 2015 07:21:35 +0000 (07:21 +0000)]
am
1962ad3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
1962ad3e09552af679feaad34452e164facb625b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 07:21:17 +0000 (07:21 +0000)]
am
d64ba82e: (-s ours) Import translations. DO NOT MERGE
* commit '
d64ba82e8953810dd8420e7810be016831528bed':
Import translations. DO NOT MERGE
Raph Levien [Mon, 13 Jul 2015 07:21:03 +0000 (07:21 +0000)]
am
1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev
* commit '
1b3d03512e7bc759d3cd340280d7a5c59195a063':
Improve Html.toHtml() documentation
Amith Yamasani [Mon, 13 Jul 2015 07:20:52 +0000 (07:20 +0000)]
am
292eb65f: Merge "Fix new user creation regression due to vold remount calls" into mnc-dev
* commit '
292eb65f1ee0747e60899c1b1d0b6cb16c9cd37a':
Fix new user creation regression due to vold remount calls
Amith Yamasani [Mon, 13 Jul 2015 07:20:42 +0000 (07:20 +0000)]
am
5449ee07: Merge "Avoid IPC call with an empty array" into mnc-dev
* commit '
5449ee078620255ce9bea60c0a4dbece36e6acf9':
Avoid IPC call with an empty array
Sanket Padawe [Mon, 13 Jul 2015 07:20:33 +0000 (07:20 +0000)]
am
233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev
* commit '
233bd3ceffbe247b5230f2832ad63c6cf1d9ed13':
Changes security for Passpoint to EAP security from "Passpoint".
Adrian Roos [Mon, 13 Jul 2015 07:20:21 +0000 (07:20 +0000)]
am
d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev
* commit '
d374c20fc9269913d19666f0994268ed457e0d42':
Fix flash of uninitialized surface
Carlos Valdivia [Mon, 13 Jul 2015 07:20:11 +0000 (07:20 +0000)]
am
97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev
* commit '
97cf0f1d76f1747302e0171c1cd4f0655fde99c4':
Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
Mady Mellor [Mon, 13 Jul 2015 07:19:59 +0000 (07:19 +0000)]
am
1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev
* commit '
1c277ca8cd699b15e631342775d996404a75e660':
Fix: line slop shouldn't always increase / decrease by one line
Mady Mellor [Mon, 13 Jul 2015 07:19:50 +0000 (07:19 +0000)]
am
a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev
* commit '
a9f07ccf38709be29137dec246bca7fea976a294':
Fix line slop issue at end of line for Thai & CJK
Wale Ogunwale [Mon, 13 Jul 2015 07:19:24 +0000 (07:19 +0000)]
am
26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev
* commit '
26b0f1e420c0590ea5e9c506f4f14ba4b0a873f0':
Revert "Finish already paused activity if it should be finished after pausing"
John Reck [Mon, 13 Jul 2015 07:19:17 +0000 (07:19 +0000)]
am
8657d9e8: Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev
* commit '
8657d9e8a56af7847578b65a881016da985b3531':
JNI optimization tweaks to Paint high-frequency methods
Chris Craik [Mon, 13 Jul 2015 07:19:10 +0000 (07:19 +0000)]
am
9f004920: Merge "Reduce cost of span type checking" into mnc-dev
* commit '
9f0049200824ae523a6cd39b9866c709d42e3075':
Reduce cost of span type checking
Billy Lau [Sun, 12 Jul 2015 22:02:34 +0000 (22:02 +0000)]
Merge "Bug:
21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
Billy Lau [Tue, 7 Jul 2015 23:31:01 +0000 (00:31 +0100)]
Bug:
21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
Raised the protection level of WRITE_SETTINGS permission to appop and also
allowed backwards compatibility with pre23 flag. Also made sure that this
permission is not added as RuntimePermission in DefaultPermissionGrantPolicy as
that breaks a lot of gmscore stuff.
Introduced new action to manage write system settings as a new API and
renamed the string that describes the managing of overlay permission.
Change-Id: Ifd25a6ddc06de68ee37015cb9fb23452e4ef10f4
Zhijun He [Sun, 12 Jul 2015 03:02:30 +0000 (20:02 -0700)]
Camera metadata: fix typos.
Bug:
22417740
Change-Id: I871b990da43132f4967faf7ee23a9a2d962c4320
Geoff Mendal [Sat, 11 Jul 2015 19:01:43 +0000 (19:01 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sat, 11 Jul 2015 17:35:45 +0000 (10:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I59264674ef40a0f68a80c0ca9973e3aba2c06db1
Auto-generated-cl: translation import
Amith Yamasani [Sat, 11 Jul 2015 17:24:45 +0000 (10:24 -0700)]
Check user state after clearing identity.
This is to fix the case where the caller has GRANT_REVOKE_PERMISSIONS
but does not have MANAGE_USERS permission.
Related to a recent fix for
Bug:
22356546
Change-Id: Id51157abad14a0bdba3a16d7cd168f61ba25e890
Geoff Mendal [Sat, 11 Jul 2015 13:47:43 +0000 (06:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I69aef7f3e9d819732675c4103553a6afe4b062b3
Auto-generated-cl: translation import
Robin Lee [Sat, 11 Jul 2015 08:17:51 +0000 (08:17 +0000)]
am
6795a2ae: Check legacy VPN is connected before alerting
* commit '
6795a2aeafa6df8a5e8e3045d29991d33c8db33f':
Check legacy VPN is connected before alerting
Jorim Jaggi [Sat, 11 Jul 2015 08:17:42 +0000 (08:17 +0000)]
am
0c758805: Merge "Fix empty keyguard for once and all" into mnc-dev
* commit '
0c758805b385a5c136b21a2b38e2383c30665282':
Fix empty keyguard for once and all
Jinsuk Kim [Sat, 11 Jul 2015 08:17:33 +0000 (08:17 +0000)]
am
256642aa: Merge "CEC: Do not switch language if the new one is same as the old one" into mnc-dev
* commit '
256642aa2f7045552d474d814323e9eb5b486113':
CEC: Do not switch language if the new one is same as the old one
Raph Levien [Sat, 11 Jul 2015 06:09:09 +0000 (06:09 +0000)]
Merge "Improve Html.toHtml() documentation" into mnc-dev
Amith Yamasani [Sat, 11 Jul 2015 02:27:59 +0000 (02:27 +0000)]
Merge "Fix new user creation regression due to vold remount calls" into mnc-dev
Amith Yamasani [Sat, 11 Jul 2015 02:27:31 +0000 (02:27 +0000)]
Merge "Avoid IPC call with an empty array" into mnc-dev
Sanket Padawe [Sat, 11 Jul 2015 01:46:31 +0000 (01:46 +0000)]
Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev
Elliott Hughes [Sat, 11 Jul 2015 01:39:45 +0000 (01:39 +0000)]
am
94fed352: am
188af044: Merge "Revert "frameworks/base: libexpat now exports its headers.""
* commit '
94fed352f6f4dc1c53ea69a0cee3944f55b92d99':
Revert "frameworks/base: libexpat now exports its headers."
Elliott Hughes [Sat, 11 Jul 2015 01:18:00 +0000 (01:18 +0000)]
am
188af044: Merge "Revert "frameworks/base: libexpat now exports its headers.""
* commit '
188af044685802cfd5266fe45b68528a2413ce3d':
Revert "frameworks/base: libexpat now exports its headers."
Elliott Hughes [Sat, 11 Jul 2015 01:08:13 +0000 (01:08 +0000)]
Merge "Revert "frameworks/base: libexpat now exports its headers.""
Elliott Hughes [Sat, 11 Jul 2015 01:07:39 +0000 (01:07 +0000)]
Revert "frameworks/base: libexpat now exports its headers."
This reverts commit
2f31b66c04b1e80fd039418edf41e74f67b68143.
Change-Id: Ib4ce610d1767db5c72c54d33520e8bdf50171a18
Elliott Hughes [Sat, 11 Jul 2015 01:02:59 +0000 (01:02 +0000)]
am
4d4c4507: am
220b61f1: Merge "frameworks/base: libexpat now exports its headers."
* commit '
4d4c45071b56089112bcfc687d635b966b810f4b':
frameworks/base: libexpat now exports its headers.
Adrian Roos [Sat, 11 Jul 2015 00:57:17 +0000 (00:57 +0000)]
Merge "Fix flash of uninitialized surface" into mnc-dev
Elliott Hughes [Sat, 11 Jul 2015 00:52:48 +0000 (00:52 +0000)]
am
220b61f1: Merge "frameworks/base: libexpat now exports its headers."
* commit '
220b61f14387e492be4ae8b819a5f96ca9b8dc36':
frameworks/base: libexpat now exports its headers.
Raph Levien [Sat, 11 Jul 2015 00:11:39 +0000 (17:11 -0700)]
Improve Html.toHtml() documentation
The existing documentation is very terse and users were getting
confused whether the method escapes HTML metacharacters or not. Expand
the description a bit and explicitly state that metacharacters are
escaped.
Bug:
17456925
Change-Id: Icaae7fe1344629de5c0860674f3913781de18013
Elliott Hughes [Sat, 11 Jul 2015 00:40:47 +0000 (00:40 +0000)]
Merge "frameworks/base: libexpat now exports its headers."
Carlos Valdivia [Sat, 11 Jul 2015 00:40:07 +0000 (00:40 +0000)]
Merge "Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""" into mnc-dev
Mady Mellor [Sat, 11 Jul 2015 00:30:32 +0000 (00:30 +0000)]
Merge "Fix: line slop shouldn't always increase / decrease by one line" into mnc-dev
Mady Mellor [Sat, 11 Jul 2015 00:26:33 +0000 (00:26 +0000)]
Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev
Mady Mellor [Fri, 10 Jul 2015 23:43:32 +0000 (16:43 -0700)]
Fix line slop issue at end of line for Thai & CJK
Previously touch slop for line movement was based on the line position
of the HandleView, not the previous line touched.
Thai and CJK languages don't have a space at the end of a line so
the handle jumps to the beginning of the next line. This meant that
when calculating the touch slop it'd be from the incorrect line.
This CL tracks the previous line touched and uses that instead to
calculate touch slop and applies it to the selection and insertion
handles.
Note this is *not* added to the drag accelerator because
it does not have the problem of the handle jumping to the next line
since it has no handles.
Bug:
21925162
Change-Id: If4b231725c06489ec780a5b5a308ceffee804c20
Robert Greenwalt [Fri, 10 Jul 2015 23:00:36 +0000 (16:00 -0700)]
Fix filter on CONNECTIVITY_ACTION updates
Only send for network types which the network supports.
bug:
22411968
Change-Id: I97765544eb653caf0ea4fc5d3feec5742d5d88dc
Wale Ogunwale [Fri, 10 Jul 2015 22:53:11 +0000 (22:53 +0000)]
Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev
Adrian Roos [Fri, 10 Jul 2015 22:49:03 +0000 (15:49 -0700)]
Fix flash of uninitialized surface
Fixes a bug where during the animation of
the backdrop uninitialized memory was showing
because the backdrop's alpha was zero, so RenderNode
didn't issue any drawing commands.
Bug:
21472158
Change-Id: I7ad6bb64e739059febffca10463c8097693a9563
John Reck [Fri, 10 Jul 2015 22:46:17 +0000 (22:46 +0000)]
Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev
Chris Craik [Fri, 10 Jul 2015 22:44:27 +0000 (22:44 +0000)]
Merge "Reduce cost of span type checking" into mnc-dev
Wale Ogunwale [Fri, 10 Jul 2015 22:25:38 +0000 (15:25 -0700)]
Revert "Finish already paused activity if it should be finished after pausing"
This reverts commit
bef8a3e39372ca85104b894f7359deddc97a8fec.
Changed caused some existing apps to crash. Reverting to unblock the
build while I investigate.
Bug:
22170595
Bug:
22397812
Carlos Valdivia [Fri, 10 Jul 2015 20:04:43 +0000 (13:04 -0700)]
Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
Fixes api stuff.
This reverts commit
f2d248db8078e716b809e0a17cacdea5c5609bd5.
Change-Id: I75c05a17ebde4f245e1f3e0cc22e622d06534c4b
Chris Wren [Fri, 10 Jul 2015 21:33:39 +0000 (17:33 -0400)]
add new enums to MetricsConstans
Bug:
21114836
Change-Id: Id62701be012c10bc11ee1ff8aa8435e178d35684
Robin Lee [Tue, 7 Jul 2015 02:20:59 +0000 (19:20 -0700)]
Check legacy VPN is connected before alerting
Legacy VPN does nothing if the device has no underlying network
connection, so showing this warning in that case is confusing.
Conversely third-party VPN can still be dangerous since a malicious
app will store sensitive information and upload it later.
Bug:
21499103
Change-Id: I25a0d4e1e5b10198cb067f06645f0e5ecf81bf56
Jorim Jaggi [Fri, 10 Jul 2015 21:16:24 +0000 (21:16 +0000)]
Merge "Fix empty keyguard for once and all" into mnc-dev
Jinsuk Kim [Fri, 10 Jul 2015 21:09:07 +0000 (21:09 +0000)]
Merge "CEC: Do not switch language if the new one is same as the old one" into mnc-dev
Jorim Jaggi [Thu, 9 Jul 2015 23:08:02 +0000 (16:08 -0700)]
Fix empty keyguard for once and all
When a Keyguard exit animation was played while the screen was
turning off, the window animation was cancelled. However, since
we didn't reset mPostKeyguardExitAnimation, we thought we need to
apply it again, with a start time of Long.MIN_VALUE. For some reason,
this animation never ended, and it was stuck at the beginning. Thus,
the alpha was 0 and the user just saw a blank wallpaper.
In addition, we also forbid starting the Keyguard exit animation when
the screen is about to turn off.
Bug:
21124013
Change-Id: Ief022c5bd758a9fedcaab3fe9fc385fa4234b37f
David Friedman [Fri, 10 Jul 2015 20:28:45 +0000 (20:28 +0000)]
am
c1541571: am
1c231da0: am
48143e6a: Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
* commit '
c1541571ff501ba7f58ab9f066828e6620aaa90c':
Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
Chris Craik [Fri, 10 Jul 2015 20:12:34 +0000 (13:12 -0700)]
Reduce cost of span type checking
bug:
22378829
Change-Id: I1da5154b2fb4f5032eaed44586d5470d28ceb45b
David Friedman [Fri, 10 Jul 2015 20:11:46 +0000 (20:11 +0000)]
am
1c231da0: am
48143e6a: Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
* commit '
1c231da06c9e9f82c52d36211a865703a5d0cd62':
Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
David Friedman [Fri, 10 Jul 2015 19:55:22 +0000 (19:55 +0000)]
am
48143e6a: Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
* commit '
48143e6ab960860a87171563d8a7535b41762ffa':
Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
David Friedman [Fri, 10 Jul 2015 18:41:02 +0000 (11:41 -0700)]
Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
Fixes broken anchors in yellow banner on English version. Adds the banner
to non-English version pages. Adjusted wording for a Known Issue on the
"Support and Release Notes" page.
Change-Id: Ia1db8db34cec854bcc4ad7daa1ad44fa23fc878e
Robin Lee [Fri, 10 Jul 2015 19:17:06 +0000 (19:17 +0000)]
am
f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev
* commit '
f180fe31de4cc428c298a2faed394c417ade5483':
Legacy VPN calls to require a userID
Robin Lee [Fri, 10 Jul 2015 19:05:36 +0000 (19:05 +0000)]
Merge "Legacy VPN calls to require a userID" into mnc-dev
Raph Levien [Fri, 10 Jul 2015 18:48:57 +0000 (18:48 +0000)]
am
5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev
* commit '
5d1654a9439f0ed81ecccecfacda34872270dfcb':
Fix StaticLayout crash when maxLines = 0
Raph Levien [Fri, 10 Jul 2015 18:37:43 +0000 (18:37 +0000)]
Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev
Robert Greenwalt [Fri, 10 Jul 2015 18:34:40 +0000 (18:34 +0000)]
am
1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev
* commit '
1570b6b3c7d1d41a52555312d161d0afe4b81df3':
Enable EMERGENCY mobile connections.
Robert Greenwalt [Fri, 10 Jul 2015 18:34:32 +0000 (18:34 +0000)]
am
1ebcb6f8: Merge "Fix permissions." into mnc-dev
* commit '
1ebcb6f8b2f989c84311555f4961506dba959d37':
Fix permissions.
Robert Greenwalt [Fri, 10 Jul 2015 18:23:12 +0000 (18:23 +0000)]
Merge "Enable EMERGENCY mobile connections." into mnc-dev
Robert Greenwalt [Fri, 10 Jul 2015 18:21:45 +0000 (18:21 +0000)]
Merge "Fix permissions." into mnc-dev
Elliott Hughes [Fri, 10 Jul 2015 18:12:22 +0000 (11:12 -0700)]
frameworks/base: libexpat now exports its headers.
Change-Id: Iaba3d57db18ebdd89e4a993436e9bf844722ff87
Chris Banes [Fri, 10 Jul 2015 17:59:43 +0000 (17:59 +0000)]
am
77cae786: am
98b1f102: am
c2b0d1d4: Merge "Support Library v22.2.0 API diff" into mnc-preview-docs
* commit '
77cae7869dba770f9ec8054b312a29dea8f317f4':
Support Library v22.2.0 API diff
John Reck [Fri, 10 Jul 2015 17:59:37 +0000 (17:59 +0000)]
am
2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev
* commit '
2c7ed6e80a7e9504a0c0e13a27e54332c603d1cc':
Improve ImageView drawable re-use