206359 Commits

Author SHA1 Message Date
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
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
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
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
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
Raph Levien
9320bb082f am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev
* commit '5d1654a9439f0ed81ecccecfacda34872270dfcb':
  Fix StaticLayout crash when maxLines = 0
2015-07-10 18:48:36 +00:00
Chris Banes
74a3d8c5fa 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 '62fb4c7f95d5a2b7d571fe2e9097ba5ac6d7937c':
  Support Library v22.2.0 API diff
2015-07-10 18:43:02 +00:00
John Reck
5159f778f0 am f01a4710: am 1e2063fb: am d1b16386: am 2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev
* commit 'f01a471060df22ee5c92acdf8effa340b5f568b3':
  Improve ImageView drawable re-use
2015-07-10 18:42:54 +00:00
John Reck
46b9d33921 am ee3c1ea5: am 4108f565: am b25c0bb7: am 525ac80d: Merge "Create a thread_local cache for textLocale" into mnc-dev
* commit 'ee3c1ea59dfe357b9ac59b4aae056280ccc6417b':
  Create a thread_local cache for textLocale
2015-07-10 18:42:48 +00:00
David Friedman
eae4345be0 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 'b3e08bdcc07dd5fa8f640b5d25f016eacfdfb5c7':
  Docs: Revisions to top DAC landing page and several Preview-page revisions.
2015-07-10 18:42:42 +00:00
Robert Greenwalt
66f59dc1bd am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev
* commit '1570b6b3c7d1d41a52555312d161d0afe4b81df3':
  Enable EMERGENCY mobile connections.
2015-07-10 18:38:22 +00:00
Robert Greenwalt
d30a3d6693 am 1ebcb6f8: Merge "Fix permissions." into mnc-dev
* commit '1ebcb6f8b2f989c84311555f4961506dba959d37':
  Fix permissions.
2015-07-10 18:38:15 +00:00
Raph Levien
5d1654a943 Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev 2015-07-10 18:37:49 +00:00
Chris Banes
62fb4c7f95 am 9c533577: am ead0cea0: am 77cae786: am 98b1f102: am c2b0d1d4: Merge "Support Library v22.2.0 API diff" into mnc-preview-docs
* commit '9c533577cf227046f40844cefec0745fcc5b54e6':
  Support Library v22.2.0 API diff
2015-07-10 18:28:11 +00:00
John Reck
f01a471060 am 1e2063fb: am d1b16386: am 2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev
* commit '1e2063fb22bead9494a791a8eb1578abae4d3265':
  Improve ImageView drawable re-use
2015-07-10 18:28:02 +00:00
John Reck
ee3c1ea59d am 4108f565: am b25c0bb7: am 525ac80d: Merge "Create a thread_local cache for textLocale" into mnc-dev
* commit '4108f5653483076f53e28b26cd4b98e39661b0f7':
  Create a thread_local cache for textLocale
2015-07-10 18:27:56 +00:00
David Friedman
b3e08bdcc0 am adfbd572: am d38de2a1: am a2c2cc42: am 3f831568: am 6fb22b4e: Docs: Revisions to top DAC landing page and several Preview-page revisions.
* commit 'adfbd57278d8a6fda9763395919fcea8c9f26ffb':
  Docs: Revisions to top DAC landing page and several Preview-page revisions.
2015-07-10 18:27:50 +00:00
Robert Greenwalt
1570b6b3c7 Merge "Enable EMERGENCY mobile connections." into mnc-dev 2015-07-10 18:23:24 +00:00
Robert Greenwalt
1ebcb6f8b2 Merge "Fix permissions." into mnc-dev 2015-07-10 18:21:48 +00:00
Chris Banes
9c533577cf am ead0cea0: am 77cae786: am 98b1f102: am c2b0d1d4: Merge "Support Library v22.2.0 API diff" into mnc-preview-docs
* commit 'ead0cea0f57565aeb6ddc3a78ec1da3314d264a8':
  Support Library v22.2.0 API diff
2015-07-10 18:14:25 +00:00
John Reck
1e2063fb22 am d1b16386: am 2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev
* commit 'd1b16386e7a2c793bb0fc3d19708f1c2853e92da':
  Improve ImageView drawable re-use
2015-07-10 18:14:19 +00:00
John Reck
4108f56534 am b25c0bb7: am 525ac80d: Merge "Create a thread_local cache for textLocale" into mnc-dev
* commit 'b25c0bb7ad06c7339555b54e17e183e04ed40d13':
  Create a thread_local cache for textLocale
2015-07-10 18:14:15 +00:00
David Friedman
adfbd57278 am d38de2a1: am a2c2cc42: am 3f831568: am 6fb22b4e: Docs: Revisions to top DAC landing page and several Preview-page revisions.
* commit 'd38de2a14d59d99eba9e2611132ff50a0e825ae2':
  Docs: Revisions to top DAC landing page and several Preview-page revisions.
2015-07-10 18:14:10 +00:00
Roshan Pius
a1930fd2a9 am 6943f7c4: am affda16a: am 17b2a31a: am 0eb4da60: am 1cb0de17: Merge "Correct the comparison done in removeAdapter." into mnc-dev
* commit '6943f7c40293a7b6e5881d3b2c513c1db1ea06d8':
  Correct the comparison done in removeAdapter.
2015-07-10 18:05:32 +00:00
Chris Banes
ead0cea0f5 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
2015-07-10 18:00:58 +00:00
John Reck
d1b16386e7 am 2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev
* commit '2c7ed6e80a7e9504a0c0e13a27e54332c603d1cc':
  Improve ImageView drawable re-use
2015-07-10 18:00:55 +00:00
John Reck
b25c0bb7ad am 525ac80d: Merge "Create a thread_local cache for textLocale" into mnc-dev
* commit '525ac80d2dda4ce7a902b67d082ed26d0986f525':
  Create a thread_local cache for textLocale
2015-07-10 18:00:50 +00:00
David Friedman
d38de2a14d am a2c2cc42: am 3f831568: am 6fb22b4e: Docs: Revisions to top DAC landing page and several Preview-page revisions.
* commit 'a2c2cc422c47a62b5494c9090b644a8fae8a9037':
  Docs: Revisions to top DAC landing page and several Preview-page revisions.
2015-07-10 18:00:46 +00:00
Chris Banes
77cae7869d am 98b1f102: am c2b0d1d4: Merge "Support Library v22.2.0 API diff" into mnc-preview-docs
* commit '98b1f1025c606f955ab9afc3872a435a770e3813':
  Support Library v22.2.0 API diff
2015-07-10 17:54:40 +00:00
Paul Jensen
a1f7009afa am 7aafe379: am 59cabcec: am 42280a7a: am 0bac7fa7: am 3b9ce37b: Fix build break.
* commit '7aafe37981427f83f8eb263a610e60cd292dbfdb':
  Fix build break.
2015-07-10 17:54:12 +00:00
Filip Gruszczynski
77b183f122 am c2464e41: (-s ours) am da7c03e7: am 74d0c63a: am c3d69a79: (-s ours) DO NOT MERGE - Fix NPE when requesting outsets for detached view.
* commit 'c2464e412803cd2d11945bd18b8e3fa9fe070476':
  DO NOT MERGE - Fix NPE when requesting outsets for detached view.
2015-07-10 17:54:05 +00:00
Roshan Pius
6943f7c402 am affda16a: am 17b2a31a: am 0eb4da60: am 1cb0de17: Merge "Correct the comparison done in removeAdapter." into mnc-dev
* commit 'affda16a7222ce21dd6dccd3059d71cfd4c7eef8':
  Correct the comparison done in removeAdapter.
2015-07-10 17:50:30 +00:00
John Reck
2c7ed6e80a Merge "Improve ImageView drawable re-use" into mnc-dev 2015-07-10 17:50:28 +00:00
John Reck
525ac80d2d Merge "Create a thread_local cache for textLocale" into mnc-dev 2015-07-10 17:50:12 +00:00
David Friedman
a2c2cc422c am 3f831568: am 6fb22b4e: Docs: Revisions to top DAC landing page and several Preview-page revisions.
* commit '3f83156867fba70db9f2a03f2f0192d8f3b4688e':
  Docs: Revisions to top DAC landing page and several Preview-page revisions.
2015-07-10 17:43:32 +00:00
Jarkko Pöyry
19b4ef6622 Merge "Don't NPE on command line parse failure." 2015-07-10 17:40:32 +00:00
Chris Banes
98b1f1025c am c2b0d1d4: Merge "Support Library v22.2.0 API diff" into mnc-preview-docs
* commit 'c2b0d1d42cf6ba2e77fdf31982b3436eeb95b89c':
  Support Library v22.2.0 API diff
2015-07-10 17:39:34 +00:00
Paul Jensen
7aafe37981 am 59cabcec: am 42280a7a: am 0bac7fa7: am 3b9ce37b: Fix build break.
* commit '59cabcece22fadb72b2f485ef08610eba5c31623':
  Fix build break.
2015-07-10 17:37:30 +00:00
Filip Gruszczynski
c2464e4128 am da7c03e7: am 74d0c63a: am c3d69a79: (-s ours) DO NOT MERGE - Fix NPE when requesting outsets for detached view.
* commit 'da7c03e724ff38dbfc8ea948d64bff795e57129a':
  DO NOT MERGE - Fix NPE when requesting outsets for detached view.
2015-07-10 17:37:25 +00:00