Derek Sollenberger
1d69248667
Merge "Remove unused functions and variables from DisplayListCanvas"
2015-07-13 12:06:08 +00:00
Yasuhiro Matsuda
6ea36507e2
Merge "Remove an unused variable from AudioService."
2015-07-13 04:36:04 +00:00
Geoff Mendal
38a8997209
Merge "Import translations. DO NOT MERGE"
2015-07-11 18:58:43 +00:00
Geoff Mendal
11e8badbb4
Import translations. DO NOT MERGE
...
Change-Id: Id3e242d2f0810af309e2d78b053c69a6561c8a81
Auto-generated-cl: translation import
2015-07-11 10:24:17 -07:00
Geoff Mendal
2a62d7fee5
Merge "Import translations. DO NOT MERGE"
2015-07-11 12:56:15 +00:00
Geoff Mendal
df087e36a2
Import translations. DO NOT MERGE
...
Change-Id: Ic4a0e4e1955564ca13435ba3e01b4f07372a6239
Auto-generated-cl: translation import
2015-07-11 05:51:33 -07:00
Geoff Mendal
683479ba39
Merge "Import translations. DO NOT MERGE"
2015-07-11 12:26:17 +00:00
Geoff Mendal
7faf046e23
Import translations. DO NOT MERGE
...
Change-Id: I7ba65aa847a11b79b58d979d791ef1683c7be93b
Auto-generated-cl: translation import
2015-07-11 05:24:05 -07:00
Geoff Mendal
85db320ec8
Import translations. DO NOT MERGE
...
Change-Id: I27f86997807a65c6dfd9eba377f9bce991a3815e
Auto-generated-cl: translation import
2015-07-11 05:21:15 -07:00
Andreas Gampe
2bc67a1b5f
Frameworks/base: Disable Clang in core/jni
...
thread_local does not work with Clang at the moment.
Bug: 22414716
Change-Id: I4059b63a1621c346bfc72dbbec0b9cb165485e26
2015-07-10 21:46:17 -07:00
Elliott Hughes
3c23a7af47
am 37b894c9: am 94fed352: am 188af044: Merge "Revert "frameworks/base: libexpat now exports its headers.""
...
* commit '37b894c9f844829e008e69bc66bd160d32812743':
Revert "frameworks/base: libexpat now exports its headers."
2015-07-11 02:14:14 +00:00
Elliott Hughes
37b894c9f8
am 94fed352: am 188af044: Merge "Revert "frameworks/base: libexpat now exports its headers.""
...
* commit '94fed352f6f4dc1c53ea69a0cee3944f55b92d99':
Revert "frameworks/base: libexpat now exports its headers."
2015-07-11 02:03:58 +00:00
Elliott Hughes
94fed352f6
am 188af044: Merge "Revert "frameworks/base: libexpat now exports its headers.""
...
* commit '188af044685802cfd5266fe45b68528a2413ce3d':
Revert "frameworks/base: libexpat now exports its headers."
2015-07-11 01:18:00 +00:00
Elliott Hughes
220c3c3073
am 3108dabf: am 4d4c4507: am 220b61f1: Merge "frameworks/base: libexpat now exports its headers."
...
* commit '3108dabf05862f8f14e05a7da1cdbc398f78c49d':
frameworks/base: libexpat now exports its headers.
2015-07-11 01:17:40 +00:00
Elliott Hughes
188af04468
Merge "Revert "frameworks/base: libexpat now exports its headers.""
2015-07-11 01:08:14 +00:00
Elliott Hughes
ba7e659b55
Revert "frameworks/base: libexpat now exports its headers."
...
This reverts commit 2f31b66c04b1e80fd039418edf41e74f67b68143.
Change-Id: Ib4ce610d1767db5c72c54d33520e8bdf50171a18
2015-07-11 01:07:39 +00:00
Elliott Hughes
3108dabf05
am 4d4c4507: am 220b61f1: Merge "frameworks/base: libexpat now exports its headers."
...
* commit '4d4c45071b56089112bcfc687d635b966b810f4b':
frameworks/base: libexpat now exports its headers.
2015-07-11 01:04:37 +00:00
Elliott Hughes
4d4c45071b
am 220b61f1: Merge "frameworks/base: libexpat now exports its headers."
...
* commit '220b61f14387e492be4ae8b819a5f96ca9b8dc36':
frameworks/base: libexpat now exports its headers.
2015-07-11 00:52:48 +00:00
Elliott Hughes
220b61f143
Merge "frameworks/base: libexpat now exports its headers."
2015-07-11 00:40:48 +00:00
David Friedman
6bfbce66b7
am 6ae031fc: am b1646f87: am 2d251316: am 888436f5: am c1541571: am 1c231da0: am 48143e6a: Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
...
* commit '6ae031fc7534569f31b809e1ca5552a7d0902aef':
Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
2015-07-10 21:30:13 +00:00
David Friedman
6ae031fc75
am b1646f87: am 2d251316: am 888436f5: am c1541571: am 1c231da0: am 48143e6a: Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
...
* commit 'b1646f8713a6877f0a36a68fe58ab9792aab887c':
Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
2015-07-10 21:08:56 +00:00
David Friedman
b1646f8713
am 2d251316: am 888436f5: am c1541571: am 1c231da0: am 48143e6a: Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
...
* commit '2d2513168212e22d3f7cc0b2a26e8649b08fd29a':
Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
2015-07-10 20:57:24 +00:00
David Friedman
2d25131682
am 888436f5: am c1541571: am 1c231da0: am 48143e6a: Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
...
* commit '888436f5eec553621904874309d1ae7e76dd739a':
Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
2015-07-10 20:42:43 +00:00
David Friedman
888436f5ee
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
2015-07-10 20:28:22 +00:00
Robin Lee
ec4b8c8f27
am f8b96edf: am 81093dd0: am 51cfb3a4: am 2164cf4f: am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev
...
* commit 'f8b96edf47b4d54ccc91842c16cc505901459cae':
Legacy VPN calls to require a userID
2015-07-10 20:17:52 +00:00
David Friedman
c1541571ff
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
2015-07-10 20:11:46 +00:00
Robin Lee
f8b96edf47
am 81093dd0: am 51cfb3a4: am 2164cf4f: am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev
...
* commit '81093dd04bc1fdfe1f7389baefb891122e232ff9':
Legacy VPN calls to require a userID
2015-07-10 20:03:02 +00:00
David Friedman
1c231da06c
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
2015-07-10 19:55:22 +00:00
Robin Lee
81093dd04b
am 51cfb3a4: am 2164cf4f: am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev
...
* commit '51cfb3a4d6f59824ba503a0e7f0190e08ede8621':
Legacy VPN calls to require a userID
2015-07-10 19:47:12 +00:00
Raph Levien
bcedba1149
am 8b21d785: am c10176a4: am dbcd049a: am 9320bb08: am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev
...
* commit '8b21d785af995cac02eab53644f03bda90f4c383':
Fix StaticLayout crash when maxLines = 0
2015-07-10 19:47:11 +00:00
David Friedman
48143e6ab9
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
2015-07-10 12:39:41 -07:00
Raph Levien
8b21d785af
am c10176a4: am dbcd049a: am 9320bb08: am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev
...
* commit 'c10176a419b4b95a64d9d20e5137c545a4472747':
Fix StaticLayout crash when maxLines = 0
2015-07-10 19:33:05 +00:00
Robin Lee
51cfb3a4d6
am 2164cf4f: am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev
...
* commit '2164cf4f4043b4892db5688ed53624af758fcdaa':
Legacy VPN calls to require a userID
2015-07-10 19:32:40 +00:00
Derek Sollenberger
cc882b6518
Remove unused functions and variables from DisplayListCanvas
...
This also moves some functions that are only called when creating/completing
a displayList into the appropriate constructors and endRecording calls.
Change-Id: I9f6add156d7f476a52766934af713b0f852c8dea
2015-07-10 19:32:30 +00:00
Robert Greenwalt
fc9f21f701
am cc5cd900: am e84c6b37: am 2cef47ff: am 66f59dc1: am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev
...
* commit 'cc5cd90029a1968ec3126f73735fef3234a31678':
Enable EMERGENCY mobile connections.
2015-07-10 19:32:12 +00:00
Robert Greenwalt
3b8d4349fa
am dbe37152: am a084d3aa: am 8e4a0531: am d30a3d66: am 1ebcb6f8: Merge "Fix permissions." into mnc-dev
...
* commit 'dbe3715222d19e2b9b0d99384f97cb29e4746881':
Fix permissions.
2015-07-10 19:32:05 +00:00
Robin Lee
2164cf4f40
am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev
...
* commit 'f180fe31de4cc428c298a2faed394c417ade5483':
Legacy VPN calls to require a userID
2015-07-10 19:21:44 +00:00
Raph Levien
c10176a419
am dbcd049a: am 9320bb08: am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev
...
* commit 'dbcd049ac89878b7416d8325eba39c90000f8bb8':
Fix StaticLayout crash when maxLines = 0
2015-07-10 19:18:07 +00:00
Robert Greenwalt
cc5cd90029
am e84c6b37: am 2cef47ff: am 66f59dc1: am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev
...
* commit 'e84c6b37f4859371e274b30035a1a5ec04307f66':
Enable EMERGENCY mobile connections.
2015-07-10 19:17:55 +00:00
Robert Greenwalt
dbe3715222
am a084d3aa: am 8e4a0531: am d30a3d66: am 1ebcb6f8: Merge "Fix permissions." into mnc-dev
...
* commit 'a084d3aacb5b94ce6fa02312329434eeaa3b9b6b':
Fix permissions.
2015-07-10 19:17:49 +00:00
Robin Lee
f180fe31de
Merge "Legacy VPN calls to require a userID" into mnc-dev
2015-07-10 19:05:38 +00:00
Robert Greenwalt
e84c6b37f4
am 2cef47ff: am 66f59dc1: am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev
...
* commit '2cef47ff86518a486ede244ec6baad3f745aa291':
Enable EMERGENCY mobile connections.
2015-07-10 19:05:37 +00:00
Robert Greenwalt
a084d3aacb
am 8e4a0531: am d30a3d66: am 1ebcb6f8: Merge "Fix permissions." into mnc-dev
...
* commit '8e4a0531aff6d3f47ea88f9f63e713b112268a6d':
Fix permissions.
2015-07-10 19:05:31 +00:00
Raph Levien
dbcd049ac8
am 9320bb08: am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev
...
* commit '9320bb082f53dfdf34881907a736527b3bdd9b45':
Fix StaticLayout crash when maxLines = 0
2015-07-10 19:04:51 +00:00
Chris Banes
99483dc800
am 74a3d8c5: am 62fb4c7f: am 9c533577: am ead0cea0: am 77cae786: am 98b1f102: am c2b0d1d4: Merge "Support Library v22.2.0 API diff" into mnc-preview-docs
...
* commit '74a3d8c5fad56362fc0093981dcdfa0992a890d0':
Support Library v22.2.0 API diff
2015-07-10 18:57:10 +00:00
John Reck
07957aa476
am 5159f778: am f01a4710: am 1e2063fb: am d1b16386: am 2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev
...
* commit '5159f778f0ea497327bc6efc6029ae95a1d1af05':
Improve ImageView drawable re-use
2015-07-10 18:57:03 +00:00
John Reck
de96bb9214
am 46b9d339: am ee3c1ea5: am 4108f565: am b25c0bb7: am 525ac80d: Merge "Create a thread_local cache for textLocale" into mnc-dev
...
* commit '46b9d339218f612487ca87e5920b17c5f77bfdec':
Create a thread_local cache for textLocale
2015-07-10 18:56:56 +00:00
David Friedman
9f64d9ba31
am eae4345b: am b3e08bdc: am adfbd572: am d38de2a1: am a2c2cc42: am 3f831568: am 6fb22b4e: Docs: Revisions to top DAC landing page and several Preview-page revisions.
...
* commit 'eae4345be0b6609c04fab00aaf1509a8565b372c':
Docs: Revisions to top DAC landing page and several Preview-page revisions.
2015-07-10 18:56:49 +00:00
Robert Greenwalt
2cef47ff86
am 66f59dc1: am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev
...
* commit '66f59dc1bde15be207d49fafb97db372cb01d977':
Enable EMERGENCY mobile connections.
2015-07-10 18:52:25 +00:00
Robert Greenwalt
8e4a0531af
am d30a3d66: am 1ebcb6f8: Merge "Fix permissions." into mnc-dev
...
* commit 'd30a3d6693da16cf2daef05847ddaa4ae7453e83':
Fix permissions.
2015-07-10 18:52:20 +00:00