OSDN Git Service
Lorenzo Colitti [Tue, 28 Jul 2015 01:33:03 +0000 (01:33 +0000)]
am
62ca62b3: am
e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev
* commit '
62ca62b32aae083c0f2d8b0bbec1fbd7d698f4ad':
Add a test for public bugs 2111 and 2136.
Always check off-link connectivity in NetworkDiagnostics.
Filip Gruszczynski [Tue, 28 Jul 2015 01:22:56 +0000 (01:22 +0000)]
Merge "Don't animate burn-in return when it wasn't applied." into cw-e-dev
Filip Gruszczynski [Mon, 27 Jul 2015 22:28:29 +0000 (15:28 -0700)]
Don't animate burn-in return when it wasn't applied.
The burn-in protection return animation is performed based on the last
offset that was used, but it doesn't mean that such offset is currently
applied. Right after entering ambient mode no offset is applied, so if
we start a return animation using the last applied offset, it will cause
a shake. The animation will first shift from 0, 0 offset to the last
offset and then return again to 0, 0. This CL makes it not apply the
animation in that case.
Bug:
22519478
Change-Id: I5cb750b56e9715c6d9389136071a5e0fbafb047b
Lorenzo Colitti [Tue, 28 Jul 2015 01:20:16 +0000 (01:20 +0000)]
am
e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev
* commit '
e288b3af14421731d8f477b97e8d77588f20498b':
Add a test for public bugs 2111 and 2136.
Always check off-link connectivity in NetworkDiagnostics.
Jorim Jaggi [Tue, 28 Jul 2015 01:06:28 +0000 (01:06 +0000)]
am
7d07aff8: am
965bab2b: Merge "Allow assist gesture when notification shade is expanded" into mnc-dev
* commit '
7d07aff85e41a95ce4743d3b371935c9f21813ab':
Allow assist gesture when notification shade is expanded
Lorenzo Colitti [Tue, 28 Jul 2015 01:03:44 +0000 (01:03 +0000)]
Merge changes I5c994de5,I6cb0dd84 into mnc-dev
* changes:
Add a test for public bugs 2111 and 2136.
Always check off-link connectivity in NetworkDiagnostics.
Jorim Jaggi [Tue, 28 Jul 2015 00:50:49 +0000 (00:50 +0000)]
am
965bab2b: Merge "Allow assist gesture when notification shade is expanded" into mnc-dev
* commit '
965bab2bae4198deaa929c8f36e44c561fb2c72c':
Allow assist gesture when notification shade is expanded
Jorim Jaggi [Tue, 28 Jul 2015 00:36:14 +0000 (00:36 +0000)]
Merge "Allow assist gesture when notification shade is expanded" into mnc-dev
Mady Mellor [Tue, 28 Jul 2015 00:31:14 +0000 (00:31 +0000)]
am
9659297d: am
beb6e668: Merge "Allow text selection handles to scroll horizontally" into mnc-dev
* commit '
9659297d9c26a8a2fdfa3c0e23b92e0fb72398ca':
Allow text selection handles to scroll horizontally
Ruben Brunk [Tue, 28 Jul 2015 00:31:09 +0000 (00:31 +0000)]
am
2384e2a4: am
ee2a16b5: Merge "Update DngCreator to correctly handle array sizes." into mnc-dev
* commit '
2384e2a4b96eb64f1d205a0f0f46c7f3aa1ca79f':
Update DngCreator to correctly handle array sizes.
Adam Lesinski [Tue, 28 Jul 2015 00:31:04 +0000 (00:31 +0000)]
am
e1e94c7d: am
fd44b56d: Merge "AAPT: Fix printing of resource configurations" into mnc-dev
* commit '
e1e94c7d58a176c3250438d4fdd35ef552cfe92a':
AAPT: Fix printing of resource configurations
Filip Gruszczynski [Tue, 28 Jul 2015 00:30:59 +0000 (00:30 +0000)]
am
3bb0bb3a: am
f63800dd: Merge "Remove unnecessary relayout call from traversals." into mnc-dev
* commit '
3bb0bb3afc46f88e4372f6912bd4c18547de5a78':
Remove unnecessary relayout call from traversals.
Mady Mellor [Tue, 28 Jul 2015 00:22:32 +0000 (00:22 +0000)]
am
beb6e668: Merge "Allow text selection handles to scroll horizontally" into mnc-dev
* commit '
beb6e66817e084c8a1ac92ecaeb6f0c73d11cc49':
Allow text selection handles to scroll horizontally
Ruben Brunk [Tue, 28 Jul 2015 00:22:28 +0000 (00:22 +0000)]
am
ee2a16b5: Merge "Update DngCreator to correctly handle array sizes." into mnc-dev
* commit '
ee2a16b551a2203deda6250836d8e75a9a046b7e':
Update DngCreator to correctly handle array sizes.
Mady Mellor [Tue, 28 Jul 2015 00:16:49 +0000 (00:16 +0000)]
Merge "Allow text selection handles to scroll horizontally" into mnc-dev
Adam Lesinski [Tue, 28 Jul 2015 00:16:38 +0000 (00:16 +0000)]
am
fd44b56d: Merge "AAPT: Fix printing of resource configurations" into mnc-dev
* commit '
fd44b56d599bc6c6e7397dcdfaa6d613805a88cb':
AAPT: Fix printing of resource configurations
Filip Gruszczynski [Tue, 28 Jul 2015 00:16:34 +0000 (00:16 +0000)]
am
f63800dd: Merge "Remove unnecessary relayout call from traversals." into mnc-dev
* commit '
f63800ddcc68944532f7842b6ebf80898147ed4d':
Remove unnecessary relayout call from traversals.
Ruben Brunk [Tue, 28 Jul 2015 00:11:36 +0000 (00:11 +0000)]
Merge "Update DngCreator to correctly handle array sizes." into mnc-dev
Adam Lesinski [Tue, 28 Jul 2015 00:08:45 +0000 (00:08 +0000)]
Merge "AAPT: Fix printing of resource configurations" into mnc-dev
Fyodor Kupolov [Tue, 28 Jul 2015 00:08:18 +0000 (00:08 +0000)]
am
0bc60661: am
67a32c49: Merge "Added missing check for MANAGE_USERS" into mnc-dev
* commit '
0bc606614ab4c7ec20b6696e0a6bba4f46568925':
Added missing check for MANAGE_USERS
Filip Gruszczynski [Tue, 28 Jul 2015 00:04:44 +0000 (00:04 +0000)]
Merge "Remove unnecessary relayout call from traversals." into mnc-dev
Adam Lesinski [Mon, 27 Jul 2015 23:53:14 +0000 (16:53 -0700)]
AAPT: Fix printing of resource configurations
Print out proper, copied configuration. We add fields to ResTable_config
and if we don't copy and fill in defaults when reading old configurations,
we end up with garbage values. This can potentially cause a crash as well.
Bug:
22773426
Change-Id: I64f5ebe73ee72453bcdad3a19e48f8e7ad58e9c2
Fyodor Kupolov [Mon, 27 Jul 2015 23:56:29 +0000 (23:56 +0000)]
am
67a32c49: Merge "Added missing check for MANAGE_USERS" into mnc-dev
* commit '
67a32c499177d41e48c3ac5a803f883fd97acf37':
Added missing check for MANAGE_USERS
Fyodor Kupolov [Mon, 27 Jul 2015 23:43:32 +0000 (23:43 +0000)]
Merge "Added missing check for MANAGE_USERS" into mnc-dev
Ruben Brunk [Wed, 22 Jul 2015 00:51:54 +0000 (17:51 -0700)]
Update DngCreator to correctly handle array sizes.
- Allow both pixelArraySize and preCorrectionArraySize
buffer dimensions for input buffers.
- Adjust crop, active area, and dimensions used for
opcode lists based on the input buffer size.
Bug:
22302614
Bug:
22210811
Change-Id: I16fb8921a144b0a251d555037ca45fdc12f7dd18
Raph Levien [Mon, 27 Jul 2015 22:13:12 +0000 (22:13 +0000)]
am
9c9c0eb8: am
e827c252: Merge "Allow soft hyphens in languages without patterns" into mnc-dev
* commit '
9c9c0eb88533dcaae45c128c076660e08e0746d2':
Allow soft hyphens in languages without patterns
Jeff Sharkey [Mon, 27 Jul 2015 22:13:07 +0000 (22:13 +0000)]
am
a6b44102: am
2e606d7b: Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.
* commit '
a6b441029d0c4324efddb45489dd91e9daeef4b3':
Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.
Raph Levien [Mon, 27 Jul 2015 21:56:43 +0000 (21:56 +0000)]
am
e827c252: Merge "Allow soft hyphens in languages without patterns" into mnc-dev
* commit '
e827c2525a6b76c130d2b877fbcdcf62b0ce42eb':
Allow soft hyphens in languages without patterns
Jeff Sharkey [Mon, 27 Jul 2015 21:56:38 +0000 (21:56 +0000)]
am
2e606d7b: Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.
* commit '
2e606d7be5275f2bff4c5755351bc3191ecb1bf1':
Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.
Raph Levien [Mon, 27 Jul 2015 21:50:16 +0000 (21:50 +0000)]
Merge "Allow soft hyphens in languages without patterns" into mnc-dev
Fyodor Kupolov [Mon, 27 Jul 2015 21:30:59 +0000 (14:30 -0700)]
Added missing check for MANAGE_USERS
setUserRestriction should do the same permission check as setUserRestrictions
method.
Bug:
22767990
Change-Id: I01f0508ebb23deafaa32ad5dd7063b98a78641be
Jeff Sharkey [Mon, 27 Jul 2015 21:19:54 +0000 (14:19 -0700)]
Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.
Bug:
22697024
Change-Id: Ib7277e8850a49909e5d8d5ad5502cd9315cddf0b
Selim Cinek [Mon, 27 Jul 2015 21:16:27 +0000 (21:16 +0000)]
am
73156901: am
71bfb270: Merge "Added the content description for the fingerprint icon" into mnc-dev
* commit '
73156901a06512cad4e3cb22c4d5da3066a5d445':
Added the content description for the fingerprint icon
Selim Cinek [Mon, 27 Jul 2015 21:02:47 +0000 (21:02 +0000)]
am
71bfb270: Merge "Added the content description for the fingerprint icon" into mnc-dev
* commit '
71bfb27013f983bc4a54f1924af61c07732f994e':
Added the content description for the fingerprint icon
Selim Cinek [Mon, 27 Jul 2015 20:51:57 +0000 (20:51 +0000)]
Merge "Added the content description for the fingerprint icon" into mnc-dev
Adam Lesinski [Mon, 27 Jul 2015 20:33:37 +0000 (20:33 +0000)]
am
48a90091: am
fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev
* commit '
48a90091b1f50043f000929e35d9aae5e8c457e3':
BatteryStats: Prevent BatteryService from blocking
Adam Lesinski [Mon, 27 Jul 2015 20:21:20 +0000 (20:21 +0000)]
am
fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev
* commit '
fc28d6fc9dec30e4cd98cc894d596f7df986f5b9':
BatteryStats: Prevent BatteryService from blocking
Julia Reynolds [Mon, 27 Jul 2015 20:20:41 +0000 (20:20 +0000)]
am
3df17a6d: am
f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev
* commit '
3df17a6d01507de4690601f948ec776f48ccba87':
Allow Settings to set background data restrict on secondary users.
George Mount [Mon, 27 Jul 2015 20:20:36 +0000 (20:20 +0000)]
am
fa93fbba: am
4ba1820b: Revert "am
1c964bec: Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
* commit '
fa93fbbad465956aea66206b584d0e2f8d269d2c':
Revert "am
1c964bec: Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
Raph Levien [Mon, 27 Jul 2015 20:06:24 +0000 (13:06 -0700)]
Allow soft hyphens in languages without patterns
This patch sets up an "empty" hyphenator, which it uses by default
for locales in which there is no hyphenation pattern data. This has
the effect of enabling soft hyphens (U+00AD), which were otherwise
disabled, because the "no-hyphen" code path didn't consider them.
Bug:
19605972
Change-Id: I4dcb95cee8edc48495f7c38736f5abf26fa04935
Julia Reynolds [Mon, 27 Jul 2015 20:03:28 +0000 (20:03 +0000)]
am
f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev
* commit '
f68e0236a67a8d6f8ec167df0daf332221149b51':
Allow Settings to set background data restrict on secondary users.
George Mount [Mon, 27 Jul 2015 20:03:24 +0000 (20:03 +0000)]
am
4ba1820b: Revert "am
1c964bec: Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
* commit '
4ba1820b34c215b9f844ccd06373669d9137d27c':
Revert "am
1c964bec: Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
Adam Lesinski [Mon, 27 Jul 2015 20:01:34 +0000 (20:01 +0000)]
Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev
Jason Monk [Mon, 27 Jul 2015 19:59:14 +0000 (19:59 +0000)]
am
e184aabe: am
66179430: Merge "Fix QS switch accessibility problem" into mnc-dev
* commit '
e184aabe42545282c3c9594707c6fa12dbe8fef4':
Fix QS switch accessibility problem
Svetoslav Ganov [Mon, 27 Jul 2015 19:59:10 +0000 (19:59 +0000)]
am
9124c178: am
8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev
* commit '
9124c1784d6537827a6b6423f58572395d8fb820':
Pass correct extras to the custom print options activity
Julia Reynolds [Mon, 27 Jul 2015 19:51:24 +0000 (19:51 +0000)]
Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev
Jason Monk [Mon, 27 Jul 2015 19:44:30 +0000 (19:44 +0000)]
am
66179430: Merge "Fix QS switch accessibility problem" into mnc-dev
* commit '
661794307a792690d7608dc81b4e1299937a8f67':
Fix QS switch accessibility problem
Svetoslav Ganov [Mon, 27 Jul 2015 19:44:26 +0000 (19:44 +0000)]
am
8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev
* commit '
8a54da92ce3da393396bbf0ff86d9525089dcdbf':
Pass correct extras to the custom print options activity
George Mount [Mon, 27 Jul 2015 19:39:28 +0000 (12:39 -0700)]
Revert "am
1c964bec: Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""
This reverts commit
01fe3f86b1c1e0eb3d8c9ab0b2251233f9164c5d, reversing
changes made to
b83b5fa641847ee1d533253ba5e1a3e13913b9d9.
This change is valid for mnc-dev and other mnc branches.
Jorim Jaggi [Mon, 27 Jul 2015 19:35:06 +0000 (19:35 +0000)]
am
6a601960: am
9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev
* commit '
6a601960a3cbfbed1f0ac6df65791a3149eec92e':
Move PIN/Pattern appear animation to RenderThread (1/2)
Jason Monk [Mon, 27 Jul 2015 19:27:29 +0000 (19:27 +0000)]
Merge "Fix QS switch accessibility problem" into mnc-dev
Svetoslav Ganov [Mon, 27 Jul 2015 19:23:37 +0000 (19:23 +0000)]
Merge "Pass correct extras to the custom print options activity" into mnc-dev
Jorim Jaggi [Mon, 27 Jul 2015 19:18:37 +0000 (19:18 +0000)]
am
9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev
* commit '
9e49b5d679672ea4a64382f9a36663c73603961b':
Move PIN/Pattern appear animation to RenderThread (1/2)
Jason Monk [Mon, 27 Jul 2015 19:17:14 +0000 (15:17 -0400)]
Fix QS switch accessibility problem
Set the switch state so it can be read back correctly.
Bug:
22710906
Change-Id: I2bcba96e53813118eb2be8dcb7e0b7d547767550
Julia Reynolds [Mon, 27 Jul 2015 19:10:42 +0000 (15:10 -0400)]
Allow Settings to set background data restrict on secondary users.
Bug:
22721091
Change-Id: Iadfbd25f75f233f2c3c080e0de05b0244572b6cd
Jorim Jaggi [Mon, 27 Jul 2015 18:55:29 +0000 (18:55 +0000)]
Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev
George Mount [Mon, 27 Jul 2015 18:55:00 +0000 (18:55 +0000)]
am
da30e09b: am
01fe3f86: am
1c964bec: Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
* commit '
da30e09b2be7d6bc3f27e6cec8c21bb1d7556537':
Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
Filip Gruszczynski [Mon, 27 Jul 2015 15:52:50 +0000 (08:52 -0700)]
Remove unnecessary relayout call from traversals.
All the necessary information (most importantly outsets) arrives in
addWindowToDisplay that is happening a few lines earlier.
Bug:
22073222
Change-Id: I483e98808877f32812c0e959cdfc14b4e0ca5e62
Adam Lesinski [Mon, 27 Jul 2015 18:43:05 +0000 (11:43 -0700)]
BatteryStats: Prevent BatteryService from blocking
BatteryService is a low level service, and we shouldn't have it
block in BatteryStatsService while collecting external data from
components like WiFi. Deadlocks can occur this way.
Bug:
22559655
Change-Id: I64026453d191695eb583a47163ab6f48f882b085
George Mount [Mon, 27 Jul 2015 18:41:43 +0000 (18:41 +0000)]
am
01fe3f86: am
1c964bec: Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
* commit '
01fe3f86b1c1e0eb3d8c9ab0b2251233f9164c5d':
Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
George Mount [Mon, 27 Jul 2015 18:24:40 +0000 (18:24 +0000)]
am
1c964bec: Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
* commit '
1c964bece6ce1bbbf9f641d95df3bf2de01f6ab7':
Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
Fyodor Kupolov [Mon, 27 Jul 2015 18:19:02 +0000 (18:19 +0000)]
am
d7d1ea45: am
b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev
* commit '
d7d1ea45984efdb6a514e97312045ac5b67ccb22':
Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION
Chris Craik [Mon, 27 Jul 2015 18:18:58 +0000 (18:18 +0000)]
am
520a5c56: am
4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev
* commit '
520a5c5670ef5c01dc73d4bfa46372414b2b85aa':
Fix bitmap get/set pixels for ALPHA_8
Phil Burk [Mon, 27 Jul 2015 18:18:54 +0000 (18:18 +0000)]
am
21fdbd91: am
fef1b289: Merge "MIDI: fix running status parser" into mnc-dev
* commit '
21fdbd91797dc026eacd1e057f94d1c2b1db6231':
MIDI: fix running status parser
Fyodor Kupolov [Mon, 27 Jul 2015 18:05:57 +0000 (18:05 +0000)]
am
b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev
* commit '
b83b5fa641847ee1d533253ba5e1a3e13913b9d9':
Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION
Chris Craik [Mon, 27 Jul 2015 18:05:53 +0000 (18:05 +0000)]
am
4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev
* commit '
4604c1dc67f634e1fac37f623f5b093615d49f0f':
Fix bitmap get/set pixels for ALPHA_8
Phil Burk [Mon, 27 Jul 2015 18:05:48 +0000 (18:05 +0000)]
am
fef1b289: Merge "MIDI: fix running status parser" into mnc-dev
* commit '
fef1b28917df9a23b28ec5e5e7f83097b8574550':
MIDI: fix running status parser
George Mount [Mon, 27 Jul 2015 17:38:22 +0000 (10:38 -0700)]
Revert "am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
This reverts commit
c571a9a1d026cbf262cf36a5348f99d1ca0ec835, reversing
changes made to
a29cfefe2c157a28b256771b1dce4653d405dcf1.
This should fix the build break for LMP downstream branches.
Change-Id: I22aac1dd0fb7965a2877bae224bccc8df8ee8e17
Fyodor Kupolov [Mon, 27 Jul 2015 17:27:02 +0000 (17:27 +0000)]
Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev
Chris Craik [Mon, 27 Jul 2015 17:23:52 +0000 (17:23 +0000)]
Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev
Phil Burk [Mon, 27 Jul 2015 17:15:04 +0000 (17:15 +0000)]
Merge "MIDI: fix running status parser" into mnc-dev
Tim Volodine [Mon, 27 Jul 2015 17:14:01 +0000 (17:14 +0000)]
am
2f6d6742: am
91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev
* commit '
2f6d674256cde89008c4457998b70d27721cdc64':
Revert "Invoke geolocation permissions callback with denied state by default."
Tim Volodine [Mon, 27 Jul 2015 16:57:07 +0000 (16:57 +0000)]
am
91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev
* commit '
91b31b53127aafbf3ed34b98f405d6e750627050':
Revert "Invoke geolocation permissions callback with denied state by default."
Tim Volodine [Mon, 27 Jul 2015 16:37:57 +0000 (16:37 +0000)]
Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev
Tim Volodine [Thu, 23 Jul 2015 17:16:16 +0000 (17:16 +0000)]
Revert "Invoke geolocation permissions callback with denied state by default."
This reverts commit
954d1333c478d4dba6c9a0536510da4fd94c0622.
The revert is due to apps calling super.onGeolocationPermissionsShowPrompt see b/
22685046
Bug:
22685046
Change-Id: I2a9f42b432a010828a0cafaee064480bb0f91cbe
(cherry picked from commit
0bb7d2e46710932d09688a18d4c5836f9b1413a5)
George Mount [Mon, 27 Jul 2015 15:16:33 +0000 (15:16 +0000)]
am
d7ecca5b: am
9c450936: am
c571a9a1: am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs
* commit '
d7ecca5b1c83deb820b6305121a0e016a88b763f':
Update data binding for RC1.
George Mount [Mon, 27 Jul 2015 15:16:29 +0000 (15:16 +0000)]
am
aedc09fb: (-s ours) am
c0231f26: (-s ours) am
a29cfefe: (-s ours) am
95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs
* commit '
aedc09fb88dc81a25c5d7b3b474ca112960d740c':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
George Mount [Mon, 27 Jul 2015 15:02:38 +0000 (15:02 +0000)]
am
9c450936: am
c571a9a1: am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs
* commit '
9c450936aad92920215d2bc52d2c9ce132a55432':
Update data binding for RC1.
George Mount [Mon, 27 Jul 2015 15:02:35 +0000 (15:02 +0000)]
am
c0231f26: (-s ours) am
a29cfefe: (-s ours) am
95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs
* commit '
c0231f26fe9ba13c3facb6caf42e53bae261654c':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
George Mount [Mon, 27 Jul 2015 14:49:16 +0000 (14:49 +0000)]
am
c571a9a1: am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs
* commit '
c571a9a1d026cbf262cf36a5348f99d1ca0ec835':
Update data binding for RC1.
George Mount [Mon, 27 Jul 2015 14:49:11 +0000 (14:49 +0000)]
am
a29cfefe: (-s ours) am
95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs
* commit '
a29cfefe2c157a28b256771b1dce4653d405dcf1':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
George Mount [Mon, 27 Jul 2015 14:35:50 +0000 (14:35 +0000)]
am
6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs
* commit '
6397ae6a0aedb8c7d085bb8907fc46a0e5bd7065':
Update data binding for RC1.
George Mount [Mon, 27 Jul 2015 14:35:45 +0000 (14:35 +0000)]
am
95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs
* commit '
95e6ae3ad1ba8647494f0b5007b7beee76493e03':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
George Mount [Mon, 27 Jul 2015 14:24:34 +0000 (14:24 +0000)]
Merge "Update data binding for RC1." into mnc-preview-docs
George Mount [Mon, 27 Jul 2015 14:24:17 +0000 (14:24 +0000)]
Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs
Geoff Mendal [Mon, 27 Jul 2015 14:02:12 +0000 (14:02 +0000)]
am
4cd6da53: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
4cd6da535a0b9a5938164edaa1a482a3c9f1ddf6':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Jul 2015 13:48:16 +0000 (13:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 27 Jul 2015 13:44:06 +0000 (06:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0805cc2f593746482579e1e8111f26ecd451173b
Auto-generated-cl: translation import
Chris Wren [Mon, 27 Jul 2015 13:35:51 +0000 (13:35 +0000)]
am
fdc283e9: am
11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev
* commit '
fdc283e9231ad6f396441ccf4b50f46d151b28eb':
decide interruptions based on current data, not previous data.
Chris Wren [Mon, 27 Jul 2015 13:35:47 +0000 (13:35 +0000)]
am
3dad6c66: am
45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev
* commit '
3dad6c661f76b69475bb38b950d74f5de3bb8a8f':
add ticker to enqueue message for easier debugging
Chris Wren [Mon, 27 Jul 2015 13:21:39 +0000 (13:21 +0000)]
am
11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev
* commit '
11f4cb1bccf47a0e985be6948f30709ba40f4522':
decide interruptions based on current data, not previous data.
Chris Wren [Mon, 27 Jul 2015 13:21:35 +0000 (13:21 +0000)]
am
45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev
* commit '
45a0bb18fec5b137a540e160cecd4ffd091098d9':
add ticker to enqueue message for easier debugging
Chris Wren [Mon, 27 Jul 2015 13:10:11 +0000 (13:10 +0000)]
Merge "decide interruptions based on current data, not previous data." into mnc-dev
Chris Wren [Mon, 27 Jul 2015 13:09:15 +0000 (13:09 +0000)]
Merge "add ticker to enqueue message for easier debugging" into mnc-dev
Lorenzo Colitti [Mon, 27 Jul 2015 07:35:22 +0000 (16:35 +0900)]
Add a test for public bugs 2111 and 2136.
Bug:
22602137
Bug:
22104401
Change-Id: I5c994de53b5906416767a8a1abe38fe59afb7cc0
Lorenzo Colitti [Mon, 27 Jul 2015 07:35:33 +0000 (16:35 +0900)]
Always check off-link connectivity in NetworkDiagnostics.
Currently, NetworkDiagnostics only checks off-link connectivity if
one of the DNS servers is off-link. Make it check off-link
connectivity in all cases by sending probes to Google Public DNS
if off-link DNS servers are not specified.
Bug:
22569331
Bug:
22641669
Bug:
22748900
Change-Id: I6cb0dd8491bc0c1a488631deca56722b9c1d2b3f
Erik Kline [Mon, 27 Jul 2015 05:23:23 +0000 (05:23 +0000)]
am
8c54a8e8: am
a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
* commit '
8c54a8e8c7f40037ac871d27e0a800e9c271fae9':
Change to connectivitycheck.gstatic.com
Erik Kline [Mon, 27 Jul 2015 04:32:19 +0000 (04:32 +0000)]
am
a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
* commit '
a7bdace2627cb4cd55ac7c182d9e093b3a1ffb7b':
Change to connectivitycheck.gstatic.com
Erik Kline [Mon, 27 Jul 2015 02:35:09 +0000 (02:35 +0000)]
Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
Svet Ganov [Sat, 25 Jul 2015 19:10:54 +0000 (12:10 -0700)]
Pass correct extras to the custom print options activity
bug:
22734138
Change-Id: Iea1bc32c3e863072b2021b823bef2cefa54fa540