OSDN Git Service
Makoto Onuki [Tue, 26 Jul 2016 20:55:10 +0000 (20:55 +0000)]
Merge \\"Update ShortcutManager javadoc\\" into nyc-mr1-dev am:
3858c4704c
am:
fc981defac
Change-Id: I753642044fa8cf17f9134002dc9cb375b9c22b31
Makoto Onuki [Tue, 26 Jul 2016 20:55:02 +0000 (20:55 +0000)]
Update ShortcutManager javadoc am:
fe9c9669a4
am:
d09c33f32c
Change-Id: I14fdc704a54e4b8e148b9bcd4127cadf7e89eec1
Makoto Onuki [Tue, 26 Jul 2016 20:50:04 +0000 (20:50 +0000)]
Merge \"Update ShortcutManager javadoc\" into nyc-mr1-dev
am:
3858c4704c
Change-Id: Ic48a2f015514ef3782f650afdad5d66f7ec9389f
Makoto Onuki [Tue, 26 Jul 2016 20:50:00 +0000 (20:50 +0000)]
Update ShortcutManager javadoc
am:
fe9c9669a4
Change-Id: I4bfaca9ce475e91ec0dae45739b1623ceac8a43c
Adam Powell [Tue, 26 Jul 2016 20:44:43 +0000 (20:44 +0000)]
Merge "Check for target SDK version for out-of-order fragment creation."
Makoto Onuki [Tue, 26 Jul 2016 20:40:03 +0000 (20:40 +0000)]
Merge "Update ShortcutManager javadoc" into nyc-mr1-dev
Chad Brubaker [Tue, 26 Jul 2016 20:25:41 +0000 (20:25 +0000)]
Merge "Add asUser version of sendBroadcast(Intent, String, Bundle)"
Jeff Sharkey [Tue, 26 Jul 2016 19:57:06 +0000 (19:57 +0000)]
Merge \\"Ignore stopped/deleted users when filling cache.\\" into nyc-mr1-dev am:
0711adc84d
am:
0b6c199db1
Change-Id: I444a09c81cac546bee3ebfc59965861521e462ee
Jeff Sharkey [Tue, 26 Jul 2016 19:57:02 +0000 (19:57 +0000)]
Ignore stopped/deleted users when filling cache. am:
38e0d0f512
am:
28f1ec461b
Change-Id: I044791062f3aa95b9ee210dde1bdaf93b7848ace
Jeff Sharkey [Tue, 26 Jul 2016 19:50:26 +0000 (19:50 +0000)]
Merge \"Ignore stopped/deleted users when filling cache.\" into nyc-mr1-dev
am:
0711adc84d
Change-Id: I52ffba44227224a0ca96ed4981fe94f299f77e9d
Jeff Sharkey [Tue, 26 Jul 2016 19:50:23 +0000 (19:50 +0000)]
Ignore stopped/deleted users when filling cache.
am:
38e0d0f512
Change-Id: Ie750e0f87205b4e8738fb2c61f0e9bd996e87b2b
Jeff Sharkey [Tue, 26 Jul 2016 19:36:37 +0000 (19:36 +0000)]
Merge "Ignore stopped/deleted users when filling cache." into nyc-mr1-dev
Kevin Hufnagle [Tue, 26 Jul 2016 19:23:42 +0000 (19:23 +0000)]
Merge \"docs: Migrated \\\"Network Security Configuration\\\" page on DAC (N OTA). am:
78747a1164 am:
6d34698551\" into nyc-mr1-dev-plus-aosp
am:
26ec9574d8
Change-Id: I2f73a4075e57a1fb9e898565cf962d7eb2edc20c
Kevin Hufnagle [Tue, 26 Jul 2016 19:23:38 +0000 (19:23 +0000)]
docs: Migrated \\\"Network Security Configuration\\\" page on DAC (N OTA). am:
78747a1164 am:
6d34698551
am:
de88cde410
Change-Id: I80584f3d541478d268e7c4fb5fa75f784fe2d135
Kevin Hufnagle [Tue, 26 Jul 2016 19:23:31 +0000 (19:23 +0000)]
docs: Migrated \\\"Network Security Configuration\\\" page on DAC (N OTA). am:
78747a1164 am:
1d7a40b34d
am:
8944bc0c30
Change-Id: Ida4a1395ac4748d289a9d4c74770b2b6640de911
Android Build Merger (Role) [Tue, 26 Jul 2016 19:09:38 +0000 (19:09 +0000)]
Merge "docs: Migrated \\"Network Security Configuration\\" page on DAC (N OTA). am:
78747a1164 am:
6d34698551" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Tue, 26 Jul 2016 19:09:29 +0000 (19:09 +0000)]
Merge \"Merge \\\"docs: Migrated \\\"key attestation\\\" page to a new location (for N OTA).\\\" into nyc-dev am:
6e4d765f95 am:
1c2845238a\" into nyc-mr1-dev-plus-aosp
am:
fbec3d57b4
Change-Id: I3950d22b1ffb4c9429df2f5d6b84eab8d1e90dbb
Kevin Hufnagle [Tue, 26 Jul 2016 19:09:18 +0000 (19:09 +0000)]
Merge \\\"docs: Migrated \\\"key attestation\\\" page to a new location (for N OTA).\\\" into nyc-dev am:
6e4d765f95 am:
1c2845238a
am:
4333510a37
Change-Id: I673c1e6b63497591290a1543e808a91eb65c134b
Kevin Hufnagle [Tue, 26 Jul 2016 19:09:06 +0000 (19:09 +0000)]
docs: Migrated \\"Network Security Configuration\\" page on DAC (N OTA). am:
78747a1164
am:
1d7a40b34d
Change-Id: I6ce90de1a7048724be4c3fc6d4b780eded0d0219
Kevin Hufnagle [Tue, 26 Jul 2016 19:09:03 +0000 (19:09 +0000)]
docs: Migrated \\"Network Security Configuration\\" page on DAC (N OTA). am:
78747a1164
am:
6d34698551
Change-Id: I7907170898ac394ba79d0bd3a908ecd0b823dd5e
Kevin Hufnagle [Tue, 26 Jul 2016 19:09:03 +0000 (19:09 +0000)]
Merge \"docs: Migrated \\\"key attestation\\\" page to a new location (for N OTA). am:
c946f9d103 am:
1ebaca58c4\" into nyc-mr1-dev-plus-aosp
am:
e57854b650
Change-Id: Ia4467fcbcd63772f75705aa73bf3899ebff06195
Kevin Hufnagle [Tue, 26 Jul 2016 19:08:58 +0000 (19:08 +0000)]
docs: Migrated \\\"key attestation\\\" page to a new location (for N OTA). am:
c946f9d103 am:
1ebaca58c4
am:
a7174bbec3
Change-Id: Iee435c27fdc490e88381729dd728bf8e16cf1683
Kevin Hufnagle [Tue, 26 Jul 2016 19:08:50 +0000 (19:08 +0000)]
Merge \\\"docs: Migrated \\\"key attestation\\\" page to a new location (for N OTA).\\\" into nyc-dev am:
6e4d765f95 am:
5fc8256256
am:
e4bd45ded5
Change-Id: I591895ad329bf78d0e2e371daa249a23f2c814a3
Kevin Hufnagle [Tue, 26 Jul 2016 19:08:47 +0000 (19:08 +0000)]
docs: Migrated \\\"key attestation\\\" page to a new location (for N OTA). am:
c946f9d103 am:
acb6f631d8
am:
2c1f99e173
Change-Id: I81dd039ec00cee4c3d361279eada96c409fec92c
Kevin Hufnagle [Tue, 26 Jul 2016 19:04:18 +0000 (19:04 +0000)]
docs: Migrated \"Network Security Configuration\" page on DAC (N OTA).
am:
78747a1164
Change-Id: I095a1e37838e325f7b10146cde3efb271a315ed2
Kevin Hufnagle [Tue, 26 Jul 2016 19:03:57 +0000 (19:03 +0000)]
docs: Migrated \"Network Security Configuration\" page on DAC (N OTA).
am:
78747a1164
Change-Id: If1ba3b821a6ccb368c6c61212d44ccfd04d8e7ef
Android Build Merger (Role) [Tue, 26 Jul 2016 18:56:19 +0000 (18:56 +0000)]
Merge "Merge \\"docs: Migrated \\"key attestation\\" page to a new location (for N OTA).\\" into nyc-dev am:
6e4d765f95 am:
1c2845238a" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 26 Jul 2016 18:56:01 +0000 (18:56 +0000)]
Merge "docs: Migrated \\"key attestation\\" page to a new location (for N OTA). am:
c946f9d103 am:
1ebaca58c4" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Tue, 26 Jul 2016 18:55:19 +0000 (18:55 +0000)]
Merge \\"docs: Migrated \\"key attestation\\" page to a new location (for N OTA).\\" into nyc-dev am:
6e4d765f95
am:
1c2845238a
Change-Id: Ib4da678f3df4a6aea1f9f7e5c270f8b28dc66ab0
Kevin Hufnagle [Tue, 26 Jul 2016 18:55:15 +0000 (18:55 +0000)]
docs: Migrated \\"key attestation\\" page to a new location (for N OTA). am:
c946f9d103
am:
1ebaca58c4
Change-Id: Ic47192af2c1501fc7dfb54cb8594ea497172ed5b
Kevin Hufnagle [Tue, 26 Jul 2016 18:55:12 +0000 (18:55 +0000)]
Merge \\"docs: Migrated \\"key attestation\\" page to a new location (for N OTA).\\" into nyc-dev am:
6e4d765f95
am:
5fc8256256
Change-Id: I08b7644adbe3e3d01522d5d8f963101953a63836
Kevin Hufnagle [Tue, 26 Jul 2016 18:55:09 +0000 (18:55 +0000)]
docs: Migrated \\"key attestation\\" page to a new location (for N OTA). am:
c946f9d103
am:
acb6f631d8
Change-Id: I2e07ebc5fd1d66971d7cc153da4215d04ddafa60
Jason Monk [Tue, 26 Jul 2016 18:55:06 +0000 (18:55 +0000)]
Merge \\"Fix double status bar icons\\" into nyc-mr1-dev am:
9448f1b74a
am:
c2cccc17c7
Change-Id: Iac1ac2fbc34bd4bb55c28de41164e9164038030d
Jason Monk [Tue, 26 Jul 2016 18:55:03 +0000 (18:55 +0000)]
Fix double status bar icons am:
c6fe61c59c
am:
db8fbb8984
Change-Id: I7090bb9d5a220a267b27a304f1adf0db2c145163
Jason Monk [Tue, 26 Jul 2016 18:46:18 +0000 (18:46 +0000)]
Merge \"Fix double status bar icons\" into nyc-mr1-dev
am:
9448f1b74a
Change-Id: I49f42dd69e0fffbfa10d8616199452b1d22cd492
Kevin Hufnagle [Thu, 21 Jul 2016 20:30:49 +0000 (13:30 -0700)]
docs: Migrated "Network Security Configuration" page on DAC (N OTA).
This page now resides with other pages discussing Android security
topics.
Bug:
27502850
Change-Id: I8ce3412198527a947e47e421b94c3d15cce6ec48
Jason Monk [Tue, 26 Jul 2016 18:46:13 +0000 (18:46 +0000)]
Fix double status bar icons
am:
c6fe61c59c
Change-Id: I5d881904102d23f7aa0f593fcde496a2865bef29
Kevin Hufnagle [Tue, 26 Jul 2016 18:45:45 +0000 (18:45 +0000)]
Merge \"docs: Migrated \"key attestation\" page to a new location (for N OTA).\" into nyc-dev
am:
6e4d765f95
Change-Id: I58fdbbe4efa20d1d8f8ca8be47b715edfe07f62c
Kevin Hufnagle [Tue, 26 Jul 2016 18:45:42 +0000 (18:45 +0000)]
docs: Migrated \"key attestation\" page to a new location (for N OTA).
am:
c946f9d103
Change-Id: I82716c1bfd4748d61ae01909bbed0156fa43faa9
Kevin Hufnagle [Tue, 26 Jul 2016 18:45:38 +0000 (18:45 +0000)]
Merge \"docs: Migrated \"key attestation\" page to a new location (for N OTA).\" into nyc-dev
am:
6e4d765f95
Change-Id: I1107bc377d35c8bb63a2b90118c17940105cddaf
Kevin Hufnagle [Tue, 26 Jul 2016 18:45:35 +0000 (18:45 +0000)]
docs: Migrated \"key attestation\" page to a new location (for N OTA).
am:
c946f9d103
Change-Id: I86c74144ab6530c566550b71855f02e09840d7fe
Jason Monk [Tue, 26 Jul 2016 18:39:13 +0000 (18:39 +0000)]
Merge "Fix double status bar icons" into nyc-mr1-dev
Kevin Hufnagle [Tue, 26 Jul 2016 18:34:23 +0000 (18:34 +0000)]
Merge "docs: Migrated "key attestation" page to a new location (for N OTA)." into nyc-dev
Agnieszka Madurska [Tue, 26 Jul 2016 18:18:07 +0000 (18:18 +0000)]
Merge \\"Use correct bounds for scroll bar rendering.\\" into nyc-mr1-dev am:
af9d5daae7
am:
27fbe40746
Change-Id: I94479483e4e6240ce84a1bedebbd3e521db45c8c
Aga Madurska [Tue, 26 Jul 2016 18:17:58 +0000 (18:17 +0000)]
Use correct bounds for scroll bar rendering. am:
8cc883de9e
am:
f4b8e7d969
Change-Id: I08e2c8b988c1e472950515ee719ecd7022fd45e7
Aga Madurska [Tue, 26 Jul 2016 18:08:55 +0000 (18:08 +0000)]
Merge \"Use correct bounds for scroll bar rendering.\" into nyc-mr1-dev
am:
af9d5daae7
Change-Id: I9e5514fa1795d88fa033438797c076d5a4b4fa46
Aga Madurska [Tue, 26 Jul 2016 18:08:47 +0000 (18:08 +0000)]
Use correct bounds for scroll bar rendering.
am:
8cc883de9e
Change-Id: Ie82427a678241e7237144bbe76493c055a17bc2d
Phil Weaver [Tue, 26 Jul 2016 18:07:42 +0000 (18:07 +0000)]
Merge "Clarifying docs for lifecycle of 3 a11y objects."
Agnieszka Madurska [Tue, 26 Jul 2016 17:47:29 +0000 (17:47 +0000)]
Merge "Use correct bounds for scroll bar rendering." into nyc-mr1-dev
Chen Xu [Tue, 26 Jul 2016 17:15:49 +0000 (17:15 +0000)]
Merge \\"add pii support for Rlog\\" into nyc-mr1-dev am:
a0f07728d9
am:
03e641e6e3
Change-Id: Ia289a14328175228af651b879f6aa691d90afebe
fionaxu [Tue, 26 Jul 2016 17:15:44 +0000 (17:15 +0000)]
add pii support for Rlog am:
a7ab821aa1
am:
d42fa0d7ec
Change-Id: I6d337cd7edecfdf24634ccb8d556de9f738935d7
fionaxu [Tue, 26 Jul 2016 17:09:29 +0000 (17:09 +0000)]
Merge \"add pii support for Rlog\" into nyc-mr1-dev
am:
a0f07728d9
Change-Id: Iec198c636f75347116b54314626b0d107df13a24
fionaxu [Tue, 26 Jul 2016 17:09:25 +0000 (17:09 +0000)]
add pii support for Rlog
am:
a7ab821aa1
Change-Id: I47153d683efd3256d6ee8d5b9417069b097f65c9
Jason Monk [Tue, 26 Jul 2016 17:04:50 +0000 (13:04 -0400)]
Fix double status bar icons
Don't allow the status bar icon slot list to be changed because
it confuses the relationship between StatusBarIconList and
StatusBarIconController. Set it in the constructor to enforce
this.
Change-Id: Ieeea0a9efad88179d1cccc0e5702899333de2e72
Fixes:
28524184
Chen Xu [Tue, 26 Jul 2016 17:00:17 +0000 (17:00 +0000)]
Merge "add pii support for Rlog" into nyc-mr1-dev
Aga Madurska [Tue, 26 Jul 2016 14:40:31 +0000 (15:40 +0100)]
Use correct bounds for scroll bar rendering.
Bug:
30001373
Change-Id: I20c77a2d97096bda451c3a871fd6be7ad699b047
Marco Nelissen [Tue, 26 Jul 2016 16:03:52 +0000 (16:03 +0000)]
Merge \\\\"Fix memory leak in MediaScannerConnection\\\\" am:
e40ab18590 am:
0d5bcda101 am:
fd743b4d56
am:
c737306bf9
Change-Id: I6ac82941cb1d5facab286d3ece9966908f6996a9
xiaoli.xb.zuo [Tue, 26 Jul 2016 15:55:13 +0000 (15:55 +0000)]
Merge \\\"Fix memory leak in MediaScannerConnection\\\" am:
e40ab18590 am:
0d5bcda101
am:
fd743b4d56
Change-Id: I9a8ef3f3ae06b5054f426e7936c5aa9548a9dfcd
Marco Nelissen [Tue, 26 Jul 2016 15:48:05 +0000 (15:48 +0000)]
Merge \\"Fix memory leak in MediaScannerConnection\\" am:
e40ab18590
am:
0d5bcda101
Change-Id: I5714252c0373db0fc85bf65df7b52c983fbc6171
Jeff Sharkey [Tue, 26 Jul 2016 15:47:04 +0000 (09:47 -0600)]
Ignore stopped/deleted users when filling cache.
Leave user checks intact on all other code paths, but quietly ignore
any trouble when filling cache after a user is started.
Bug:
30366396
Change-Id: I49458adb8fd6ddc203d6159513f4ecc50738d3e8
xiaoli.xb.zuo [Tue, 26 Jul 2016 15:43:55 +0000 (15:43 +0000)]
Merge \"Fix memory leak in MediaScannerConnection\"
am:
e40ab18590
Change-Id: I894584a5d193624acc78c20a6207b54b20b61563
Marco Nelissen [Tue, 26 Jul 2016 15:37:32 +0000 (15:37 +0000)]
Merge "Fix memory leak in MediaScannerConnection"
Paul Jensen [Tue, 26 Jul 2016 15:21:50 +0000 (15:21 +0000)]
Merge \\"Sanity check ICMP6 router advertisement packets\\" into nyc-mr1-dev am:
4e40413c50
am:
d3206fa7e7
Change-Id: I6146d1fd9aa590bf73576afb8b3593fcdfa45a97
Paul Jensen [Tue, 26 Jul 2016 15:21:47 +0000 (15:21 +0000)]
Sanity check ICMP6 router advertisement packets am:
4b545b04f6
am:
ea4f322274
Change-Id: I998bfb1855e02088f44fbf0826dbadc21773c446
Paul Jensen [Tue, 26 Jul 2016 15:21:44 +0000 (15:21 +0000)]
Merge \\"Don\\'t let sign-in to network app appear in recents when it finishes\\" into nyc-mr1-dev am:
c78bd7f01f
am:
9956784d32
Change-Id: Iae9aa90a14d064c77241759e9172483e7a042159
Paul Jensen [Tue, 26 Jul 2016 15:18:58 +0000 (15:18 +0000)]
Don\\'t let sign-in to network app appear in recents when it finishes am:
6a776c8317
am:
095e08981f
Change-Id: I7e6e4bab006317f5ff89be75d6ee03023d873b06
Hugo Benichi [Tue, 26 Jul 2016 15:18:55 +0000 (15:18 +0000)]
Merge \\"Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission\\" into nyc-mr1-dev am:
7c731f9e1f
am:
02dade4bce
Change-Id: I6e3927b89fc848d6ced04e2e64b321825fd6c585
Hugo Benichi [Tue, 26 Jul 2016 15:18:51 +0000 (15:18 +0000)]
resolve merge conflicts of
514da60 to nyc-mr1-dev-plus-aosp
am:
524b2e4f30
Change-Id: Ia0a4544784592ac857e5bd652fee47eec621f3a0
Chris Craik [Tue, 26 Jul 2016 15:18:47 +0000 (15:18 +0000)]
Merge \\"Avoid destroying TextureView surfaces for onStop\\" into nyc-mr1-dev am:
eaa6d6b2c9
am:
2feece06aa
Change-Id: I8ebcf35d28d5144d2dfec8371f44e5597474de0d
Chris Craik [Tue, 26 Jul 2016 15:18:45 +0000 (15:18 +0000)]
Avoid destroying TextureView surfaces for onStop am:
391d560402
am:
5fbbcdcd32
Change-Id: I1bda6841c540572ff9390c0124cb1ac9f6f22c83
Hangyu Kuang [Tue, 26 Jul 2016 15:15:32 +0000 (15:15 +0000)]
Merge \\"media: Add hidden api to set video encoding profile and level.\\" into nyc-mr1-dev am:
e7e1f0b788
am:
601ececb8c
Change-Id: I02c12aeda3ac225d663fed2ca77d4ceb07872829
Hangyu Kuang [Tue, 26 Jul 2016 15:15:27 +0000 (15:15 +0000)]
media: Add hidden api to set video encoding profile and level. am:
f70ad43f13
am:
2725d89822
Change-Id: I3c702fc0ce1b1ac78b894f665d5811c1c65c62b4
Michael Kwan [Tue, 26 Jul 2016 15:15:21 +0000 (15:15 +0000)]
Merge \\"Add top and bottom panel overlay to lists in AlertDialog for watch.\\" into nyc-mr1-dev am:
ad74941699
am:
690d86aef4
Change-Id: Ia82d309620693b52ce7fea364fce405ee0c273ed
Michael Kwan [Tue, 26 Jul 2016 15:15:17 +0000 (15:15 +0000)]
Add top and bottom panel overlay to lists in AlertDialog for watch. am:
55e4030f77
am:
253bc8d035
Change-Id: I75cb4527c56f14d58d7ab7826112b08ed368d81e
Vladislav Kaznacheev [Tue, 26 Jul 2016 15:15:09 +0000 (15:15 +0000)]
Merge \\"Fix AM.revokeUriPermissionFromOwner for prefix mode.\\" into nyc-mr1-dev am:
0217d4e6b8
am:
c5767e2eb6
Change-Id: If3514e10496b6a6b781947948f0d88b83427403f
Vladislav Kaznacheev [Tue, 26 Jul 2016 15:12:03 +0000 (15:12 +0000)]
Fix AM.revokeUriPermissionFromOwner for prefix mode. am:
4498aa6c58
am:
f12d0c96d3
Change-Id: I399e4040f664127ab3b321a4bb5a6ca3023b7be5
Philip P. Moltmann [Tue, 26 Jul 2016 15:11:55 +0000 (15:11 +0000)]
Merge \\"Set title in onCreate.\\" into nyc-mr1-dev am:
fb5a07938f
am:
784f0a23a4
Change-Id: I7e49f763187dbe73f1bec2f71c4f8e13906a4bb4
Philip P. Moltmann [Tue, 26 Jul 2016 15:11:47 +0000 (15:11 +0000)]
Set title in onCreate. am:
fef31ad5ae
am:
28c09c612f
Change-Id: I317a2ea5525518a77d286c4f472de41b2ce43bba
Justin Klaassen [Tue, 26 Jul 2016 15:11:39 +0000 (15:11 +0000)]
Merge changes I1acc3a4f,Ib049d75f into nyc-mr1-dev-plus-aosp
am:
e9720671cc
Change-Id: Ie4210de38ac851d4dfd2ba83cd8db8db890e763f
Justin Klaassen [Tue, 26 Jul 2016 15:11:34 +0000 (15:11 +0000)]
Merge \\"Fix NPE in ValueAnimator\\" into nyc-mr1-dev am:
65dfc2a3e5
am:
c98c5e0fc3
Change-Id: Ie16e4f6d04d42eed941eb24ab55d4339d38260d8
Justin Klaassen [Tue, 26 Jul 2016 15:11:27 +0000 (15:11 +0000)]
Fix NPE in ValueAnimator am:
543a7ed7af
am:
705e2fb40c
Change-Id: I5beab0d64c1544344f1153f183c513839f673a1f
Raph Levien [Tue, 26 Jul 2016 15:11:19 +0000 (15:11 +0000)]
Merge changes from topic \'am-
9fd0a895a44f4e7ebb6eebb2d79a62a9\' into nyc-mr1-dev-plus-aosp
am:
982409895c
Change-Id: I0c256aec72b97d1f90f5eb981a9ac472d0e98dac
Raph Levien [Tue, 26 Jul 2016 15:11:16 +0000 (15:11 +0000)]
Merge \\"Enforce consistent sizes for arrays in SpannableStringInternal\\" into nyc-mr1-dev am:
4e0fc3ccd2
am:
b3326e1cd4
Change-Id: Ic60e5dc71c85a31ecf4541291f2272023a48e428
Raph Levien [Tue, 26 Jul 2016 15:11:09 +0000 (15:11 +0000)]
Enforce consistent sizes for arrays in SpannableStringInternal am:
83549088c6
am:
878346cb07
Change-Id: I7a7af44dbfe328f6a34bf50609d8d50a00350ae1
Philip P. Moltmann [Tue, 26 Jul 2016 15:07:58 +0000 (15:07 +0000)]
Merge changes Idf939fd3,I6ae3f730 into nyc-mr1-dev-plus-aosp
am:
23c6d928ed
Change-Id: I9d9d93154e8c9f378261c756146a6c0774c0b40c
Philip P. Moltmann [Tue, 26 Jul 2016 15:07:55 +0000 (15:07 +0000)]
Merge \\"Handle USB power role \\'sink\\'\\" into nyc-mr1-dev am:
d021ba34fb
am:
74206f0533
Change-Id: Ic03ac0be19d1f42ee40a01b2914a90568597e841
Philip P. Moltmann [Tue, 26 Jul 2016 15:07:50 +0000 (15:07 +0000)]
Handle USB power role \\'sink\\' am:
0135516153
am:
6d0ea86fec
Change-Id: I6dd5eb7a328bd4071c4c40a2a982ec4b7de0b785
Mark Lu [Tue, 26 Jul 2016 15:07:45 +0000 (15:07 +0000)]
Merge \"Merge \\\"docs: updates to Buildilng Your First App doc\\\" into nyc-dev am:
d579d713a5 am:
0da397ea71\" into nyc-mr1-dev-plus-aosp
am:
eba36e8db9
Change-Id: I989a5d85001bbb8dfcb296628d452828670d661c
Mark Lu [Tue, 26 Jul 2016 15:07:41 +0000 (15:07 +0000)]
Merge \\\"docs: updates to Buildilng Your First App doc\\\" into nyc-dev am:
d579d713a5 am:
0da397ea71
am:
172b5d4d5c
Change-Id: Id7a171f4ad50b897c7a184b1f699413db0ee03d1
Mark Lu [Tue, 26 Jul 2016 15:07:33 +0000 (15:07 +0000)]
Merge \"docs: updates to Buildilng Your First App doc am:
08d1bff71f am:
325ce1a475\" into nyc-mr1-dev-plus-aosp
am:
3afc931fc3
Change-Id: I842697b78db33a78ec469555a0f8ec6eba66927a
Mark Lu [Tue, 26 Jul 2016 15:07:29 +0000 (15:07 +0000)]
docs: updates to Buildilng Your First App doc am:
08d1bff71f am:
325ce1a475
am:
64b340220f
Change-Id: If510d335a263491bc1cd9ad04edd46ce41bd253d
Selim Cinek [Tue, 26 Jul 2016 15:07:20 +0000 (15:07 +0000)]
Merge changes I39b8c6a5,I6a15fdea,I459d3e01 into nyc-mr1-dev-plus-aosp
am:
a2b355bba6
Change-Id: Icd0f9fafd9366eebdc901aaa98d061332208d9fa
Selim Cinek [Tue, 26 Jul 2016 15:07:16 +0000 (15:07 +0000)]
Merge changes from topic \\'home-button-lock-nyc-mr1-dev\\' into nyc-mr1-dev am:
52a11f7c64
am:
a3b7b7f8c7
Change-Id: Id2be8fe7229946165ab3551ec5e9ba8d347acac8
Selim Cinek [Tue, 26 Jul 2016 15:07:09 +0000 (15:07 +0000)]
Fixes a bug where the lockscreen would be frozen am:
3127daf036
am:
d9d592ceff
Change-Id: I258e812bc6d00fd15850fd79b27601f65a398f95
Selim Cinek [Tue, 26 Jul 2016 15:07:00 +0000 (15:07 +0000)]
Allow home button to be tapped while a incoming call shows a HUN am:
64be772e03
am:
3ee95debda
Change-Id: I6b256ffbaf2e22b2e62db627f7c2f5ca3834f501
Jason Monk [Tue, 26 Jul 2016 15:06:49 +0000 (15:06 +0000)]
Merge changes I19e53731,I12ec6445 into nyc-mr1-dev-plus-aosp
am:
b43041a8e9
Change-Id: I1e57cf7cd157790f199449bf19cb6288c70c7226
Jason Monk [Tue, 26 Jul 2016 15:06:41 +0000 (15:06 +0000)]
Merge \\"QS: Cleanup detail toggle on\\" into nyc-mr1-dev am:
5c6f5afd19
am:
8255f2c11a
Change-Id: I623b64a517eb00cb86998955346cd0a52c3c73b3
Paul Jensen [Tue, 26 Jul 2016 14:39:45 +0000 (14:39 +0000)]
Merge \"Sanity check ICMP6 router advertisement packets\" into nyc-mr1-dev
am:
4e40413c50
Change-Id: I5365b39534fd01efe9f2d8e74efd1ccba06eba4a
Paul Jensen [Tue, 26 Jul 2016 14:39:42 +0000 (14:39 +0000)]
Sanity check ICMP6 router advertisement packets
am:
4b545b04f6
Change-Id: I129ce4cbe5c893e507050ff23fd2f5261466c970
Paul Jensen [Tue, 26 Jul 2016 14:33:30 +0000 (14:33 +0000)]
Merge \"Don\'t let sign-in to network app appear in recents when it finishes\" into nyc-mr1-dev
am:
c78bd7f01f
Change-Id: I288ab6796ab15e982423cf6e58bfdacf1ca5cf52
OSDN Git Service
