OSDN Git Service
Tyler Gunn [Fri, 15 Jul 2016 15:18:07 +0000 (15:18 +0000)]
Merge \"Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems.\" into nyc-mr1-dev
am:
9e73d82336
Change-Id: Idd57c35f04193ab1157e455f4c4242e30c9ea7a2
Pankaj Kanwar [Fri, 15 Jul 2016 15:10:26 +0000 (15:10 +0000)]
Merge "Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems." into nyc-mr1-dev
Android Build Merger (Role) [Fri, 15 Jul 2016 14:41:34 +0000 (14:41 +0000)]
Merge "Merge \\\\\\"Check caller\\\\\\'s uid before allowing notification policy access.\\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours am:
8e6b7c2f72 am:
837696131e" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Fri, 15 Jul 2016 14:41:06 +0000 (14:41 +0000)]
Merge \\\\\\"Check caller\\\\\\'s uid before allowing notification policy access.\\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours am:
8e6b7c2f72
am:
837696131e
Change-Id: I76348913cc4d0905edb3badc45883bb4d14645ee
Julia Reynolds [Fri, 15 Jul 2016 14:41:05 +0000 (14:41 +0000)]
Merge \\\\\\"Check caller\\\\\\'s uid before allowing notification policy access.\\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours am:
8e6b7c2f72
am:
d59fc3a5c9
Change-Id: I1fa80e1f61ac3e2a8d929261d56334f715a6a377
Julia Reynolds [Fri, 15 Jul 2016 14:34:21 +0000 (14:34 +0000)]
Merge \\\\\"Check caller\\\\\'s uid before allowing notification policy access.\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours
am:
8e6b7c2f72
Change-Id: I0d01f75f3ba19142675de8c589071af9888deeab
Julia Reynolds [Fri, 15 Jul 2016 14:34:14 +0000 (14:34 +0000)]
Merge \\\\\"Check caller\\\\\'s uid before allowing notification policy access.\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours
am:
8e6b7c2f72
Change-Id: I10e3412be1a534f5511f72da63ea7581cab21140
Julia Reynolds [Fri, 15 Jul 2016 14:27:24 +0000 (14:27 +0000)]
Merge \\\\"Check caller\\\\'s uid before allowing notification policy access.\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89
am:
e1d8b98189 -s ours
Change-Id: I583fa066aaf12cacb841b10f751ad0ad7a1de237
Julia Reynolds [Fri, 15 Jul 2016 14:17:56 +0000 (14:17 +0000)]
Merge \\\"Check caller\\\'s uid before allowing notification policy access.\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c
am:
5c6db3af89
Change-Id: Ie212c6105f8796f0e7c4ccf25ea132b8c9f99519
Julia Reynolds [Fri, 15 Jul 2016 14:12:23 +0000 (14:12 +0000)]
Merge \\"Check caller\\'s uid before allowing notification policy access.\\" into mnc-dev am:
234e1c25e4
am:
8e8bb6633c
Change-Id: Ic36dbb69f0eeddd85b17579b2fc90f75349e4ca3
Julia Reynolds [Fri, 15 Jul 2016 14:06:49 +0000 (14:06 +0000)]
Merge \"Check caller\'s uid before allowing notification policy access.\" into mnc-dev
am:
234e1c25e4
Change-Id: I6724832d28362a76cd2f65432d6e805738f335fa
Julia Reynolds [Fri, 15 Jul 2016 13:59:04 +0000 (13:59 +0000)]
Merge "Check caller's uid before allowing notification policy access." into mnc-dev
Ricky Wai [Fri, 15 Jul 2016 10:18:36 +0000 (10:18 +0000)]
Merge \"Remove tied profile encryption key cache in keystore\" into nyc-mr1-dev
am:
3ed2a52bb1
Change-Id: I127bb8329b374e57147b42f13f699b3125872367
Ricky Wai [Fri, 15 Jul 2016 10:09:39 +0000 (10:09 +0000)]
Merge "Remove tied profile encryption key cache in keystore" into nyc-mr1-dev
Tony Mak [Fri, 15 Jul 2016 07:25:01 +0000 (07:25 +0000)]
Merge \"Whitelisting device provisioning package from app standby\" into nyc-mr1-dev
am:
0c5b73ffc2
Change-Id: Id61bd55703b1cbf6410a6b668c26170ab3621efa
Tony Mak [Fri, 15 Jul 2016 07:17:42 +0000 (07:17 +0000)]
Merge "Whitelisting device provisioning package from app standby" into nyc-mr1-dev
Alan Leung [Fri, 15 Jul 2016 06:06:58 +0000 (06:06 +0000)]
Merge \"Fix thread priority after boosting.\" into nyc-mr1-dev
am:
1e9b8138f0
Change-Id: I613e3a0b1597ce59913663264f81673448426622
Alan Leung [Fri, 15 Jul 2016 06:00:06 +0000 (06:00 +0000)]
Merge "Fix thread priority after boosting." into nyc-mr1-dev
Lajos Molnar [Fri, 15 Jul 2016 05:53:37 +0000 (05:53 +0000)]
Merge \"media: document new temporal layering schema values.\" into nyc-mr1-dev
am:
12f860f5a2
Change-Id: Ifb3c99ca6e4b2a9dcec6d58afacbcba474ea4d73
Lajos Molnar [Fri, 15 Jul 2016 05:53:28 +0000 (05:53 +0000)]
Merge \"media: clarify MediaFormat.KEY_I_FRAME_INTERVAL\" into nyc-mr1-dev
am:
991c240a88
Change-Id: Id1e1bfdb65b10f5e7b99a0e164afc05ca2518dbf
Lajos Molnar [Fri, 15 Jul 2016 05:44:03 +0000 (05:44 +0000)]
Merge "media: document new temporal layering schema values." into nyc-mr1-dev
Lajos Molnar [Fri, 15 Jul 2016 05:43:39 +0000 (05:43 +0000)]
Merge "media: clarify MediaFormat.KEY_I_FRAME_INTERVAL" into nyc-mr1-dev
Lajos Molnar [Fri, 15 Jul 2016 02:54:50 +0000 (19:54 -0700)]
media: clarify MediaFormat.KEY_I_FRAME_INTERVAL
Bug:
30096321
Change-Id: I908b669caf5443fb272a2d274b7cbf7227913b3e
Hugo Benichi [Fri, 15 Jul 2016 04:06:17 +0000 (04:06 +0000)]
Merge \"APF: filter unwanted ARP replies\" into nyc-mr1-dev
am:
b91c1232ee
Change-Id: I8b1ea85b57b3075b1ebce7b3332aca656e5391af
TreeHugger Robot [Fri, 15 Jul 2016 03:59:48 +0000 (03:59 +0000)]
Merge "APF: filter unwanted ARP replies" into nyc-mr1-dev
Tony Mak [Thu, 14 Jul 2016 07:30:18 +0000 (15:30 +0800)]
Whitelisting device provisioning package from app standby
Change-Id: Ib9cb7a3fdf7aa16a97f22eacbed872880b7f9fbe
Fix:
29892977
Lajos Molnar [Fri, 15 Jul 2016 02:10:27 +0000 (19:10 -0700)]
media: document new temporal layering schema values.
Also fix doc as these are advertised on the output port.
Bug:
30150921
Bug:
27596987
Change-Id: Ia95876ade36bc82eea0e9795dea0268abbd1c1ef
Christopher Tate [Fri, 15 Jul 2016 01:49:31 +0000 (01:49 +0000)]
Merge \"Thread-safe pipe teardown during restore operations\" into nyc-mr1-dev
am:
4595bc7f12
Change-Id: I8c53961f93633f26615970c40d071f2e8d714780
Christopher Tate [Fri, 15 Jul 2016 01:49:26 +0000 (01:49 +0000)]
Merge \"Dump the source uid of scheduled jobs\" into nyc-mr1-dev
am:
b30e1f75d1
Change-Id: I50d5d91c0fd2713d1fdfe027bcf11865b6863452
Christopher Tate [Fri, 15 Jul 2016 01:49:19 +0000 (01:49 +0000)]
Merge \"Test existence of wallpaper files before backing them up\" into nyc-mr1-dev
am:
8b08553e90
Change-Id: Ic5acc8c87cef80795c3e286f9e24604af35ff6f5
Selim Cinek [Fri, 15 Jul 2016 01:49:11 +0000 (01:49 +0000)]
Merge \"Fixed a bug where the burmese clock could overlap\" into nyc-mr1-dev
am:
f25486f8a5
Change-Id: I5184fb95e70251291e5426c07e882e346a7e51f4
Chris Tate [Fri, 15 Jul 2016 01:38:02 +0000 (01:38 +0000)]
Merge "Thread-safe pipe teardown during restore operations" into nyc-mr1-dev
Chris Tate [Fri, 15 Jul 2016 01:37:19 +0000 (01:37 +0000)]
Merge "Dump the source uid of scheduled jobs" into nyc-mr1-dev
Chris Tate [Fri, 15 Jul 2016 01:36:46 +0000 (01:36 +0000)]
Merge "Test existence of wallpaper files before backing them up" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 01:33:32 +0000 (01:33 +0000)]
Merge "Fixed a bug where the burmese clock could overlap" into nyc-mr1-dev
Makoto Onuki [Fri, 15 Jul 2016 00:49:28 +0000 (00:49 +0000)]
Merge \"Handle locale change and pacakge change in different way\" into nyc-mr1-dev
am:
83fa7a8255
Change-Id: I4988ff6c77f70211336e21729f0f6cd69beefc7d
Makoto Onuki [Fri, 15 Jul 2016 00:39:04 +0000 (00:39 +0000)]
Merge "Handle locale change and pacakge change in different way" into nyc-mr1-dev
Lajos Molnar [Fri, 15 Jul 2016 00:35:12 +0000 (00:35 +0000)]
Merge \"media: clarify notes in MediaCodec doc\" into nyc-mr1-dev
am:
82d886434d
Change-Id: Iacc43f3db9a41a0373227fc09f3590cf275ec34f
Lajos Molnar [Fri, 15 Jul 2016 00:25:29 +0000 (00:25 +0000)]
Merge "media: clarify notes in MediaCodec doc" into nyc-mr1-dev
Selim Cinek [Fri, 15 Jul 2016 00:13:48 +0000 (00:13 +0000)]
Merge \"Fixed the heads up disspearing bug for real\" into nyc-mr1-dev
am:
70b06cc62f
Change-Id: I4f800199c871b862eefd1d813e8ed04f9485d7da
TreeHugger Robot [Fri, 15 Jul 2016 00:09:46 +0000 (00:09 +0000)]
Merge "Fixed the heads up disspearing bug for real" into nyc-mr1-dev
Justin Klaassen [Fri, 15 Jul 2016 00:08:54 +0000 (00:08 +0000)]
Merge \"Don\'t activate Night display until user setup is complete\" into nyc-mr1-dev
am:
6028472b8a
Change-Id: I2dbc30f9b7744df53e17276f438db0c65a24a341
Chris Craik [Fri, 15 Jul 2016 00:08:45 +0000 (00:08 +0000)]
Merge \"Fix rotated clip regions\" into nyc-mr1-dev
am:
06f13cba5f
Change-Id: I4afab3a863f1f873e9dd95ed671072874a6a4511
TreeHugger Robot [Fri, 15 Jul 2016 00:04:20 +0000 (00:04 +0000)]
Merge "Don't activate Night display until user setup is complete" into nyc-mr1-dev
Chris Craik [Fri, 15 Jul 2016 00:02:25 +0000 (00:02 +0000)]
Merge "Fix rotated clip regions" into nyc-mr1-dev
Jim Miller [Thu, 14 Jul 2016 23:50:31 +0000 (23:50 +0000)]
Merge \"Fix bug where swiping on the fp sensor when the screen is off causes blank screen\" into nyc-mr1-dev
am:
538b836e05
Change-Id: I8391201f96bc408103727938a9b9aefd22f47793
TreeHugger Robot [Thu, 14 Jul 2016 23:45:11 +0000 (23:45 +0000)]
Merge "Fix bug where swiping on the fp sensor when the screen is off causes blank screen" into nyc-mr1-dev
Selim Cinek [Thu, 14 Jul 2016 23:32:23 +0000 (16:32 -0700)]
Fixed a bug where the burmese clock could overlap
Change-Id: I9ccd2fd5fd89c973d937196aa16d459e46eca769
Fixes:
26015598
Christopher Wiley [Thu, 14 Jul 2016 23:34:04 +0000 (23:34 +0000)]
Merge \"Properly disable WiFi tethering\" into nyc-mr1-dev
am:
f3d9863d5e
Change-Id: I3f6d475d01033930250fb97eb07b737ea546835d
TreeHugger Robot [Thu, 14 Jul 2016 23:26:55 +0000 (23:26 +0000)]
Merge "Properly disable WiFi tethering" into nyc-mr1-dev
Selim Cinek [Thu, 14 Jul 2016 22:54:32 +0000 (22:54 +0000)]
Merge \"Fixed a bug where the header was positioned wrong\" into nyc-mr1-dev
am:
b1008221f9
Change-Id: I896f6ecbcda32d58edd4ed01ad2cce760db617b6
Justin Klaassen [Tue, 12 Jul 2016 04:26:46 +0000 (21:26 -0700)]
Don't activate Night display until user setup is complete
Bug:
30042357
Change-Id: I575c5e44b4109816ae14cc139ff171f141e6088f
TreeHugger Robot [Thu, 14 Jul 2016 22:50:07 +0000 (22:50 +0000)]
Merge "Fixed a bug where the header was positioned wrong" into nyc-mr1-dev
Philip Cuadra [Thu, 14 Jul 2016 22:38:15 +0000 (22:38 +0000)]
Merge \"Call into ART to get the location of the odex/oat file to pin\" into nyc-mr1-dev
am:
8b072fbd48
Change-Id: I3e5d753597a81d2cd1938781dce4370c383725ea
Raph Levien [Thu, 14 Jul 2016 22:37:57 +0000 (22:37 +0000)]
Merge \"Don\'t count zero width space in hasGlyph layout\" into nyc-mr1-dev
am:
f9c8893d1b
Change-Id: Ib84918cf6e12392fc58500d47feeb38ab28b7d43
Seigo Nonaka [Thu, 14 Jul 2016 22:37:53 +0000 (22:37 +0000)]
Merge \"Treat U+2695, U+2640, U+2642 as emoji characters.\" into nyc-mr1-dev
am:
c0ab2e83ac
Change-Id: Iaa4d63c425f5d263d322d463c320312890588aaf
Seigo Nonaka [Thu, 14 Jul 2016 22:37:50 +0000 (22:37 +0000)]
Merge \"Delete gender-balanced emoji sequence by one backspace key event.\" into nyc-mr1-dev
am:
ef9e2a5f4b
Change-Id: If60a0502875163ec60eeac61a3195e217b34e9f5
Doug Felt [Thu, 14 Jul 2016 22:30:09 +0000 (22:30 +0000)]
Merge \"Patch out part of the emoji tests.\" into nyc-mr1-dev
am:
2f39bc777c
Change-Id: I90c3528cf6d85929114af94feb0ef2f36954ca9f
Philip Cuadra [Thu, 14 Jul 2016 22:26:20 +0000 (22:26 +0000)]
Merge "Call into ART to get the location of the odex/oat file to pin" into nyc-mr1-dev
Raph Levien [Thu, 14 Jul 2016 22:26:03 +0000 (22:26 +0000)]
Merge "Don't count zero width space in hasGlyph layout" into nyc-mr1-dev
Raph Levien [Thu, 14 Jul 2016 22:25:39 +0000 (22:25 +0000)]
Merge "Treat U+2695, U+2640, U+2642 as emoji characters." into nyc-mr1-dev
Raph Levien [Thu, 14 Jul 2016 22:25:20 +0000 (22:25 +0000)]
Merge "Delete gender-balanced emoji sequence by one backspace key event." into nyc-mr1-dev
Raph Levien [Thu, 14 Jul 2016 22:24:13 +0000 (22:24 +0000)]
Merge "Patch out part of the emoji tests." into nyc-mr1-dev
Android Build Merger (Role) [Thu, 14 Jul 2016 22:19:15 +0000 (22:19 +0000)]
Merge "Merge \\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\" into nyc-dev am:
488042fe3b am:
c4ef7669a1" into nyc-mr1-dev-plus-aosp
Victor Chang [Thu, 14 Jul 2016 22:18:51 +0000 (22:18 +0000)]
Merge \\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\" into nyc-dev am:
488042fe3b
am:
c4ef7669a1
Change-Id: I475fad882d4fb67e3af813b3a2a2548dae760c16
Victor Chang [Thu, 14 Jul 2016 22:18:28 +0000 (22:18 +0000)]
Merge \\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\" into nyc-dev am:
488042fe3b
am:
07e11c3ae9
Change-Id: If1ff799f4c515b84dbb8cb4fa6f06f747f78bf67
Victor Chang [Thu, 14 Jul 2016 22:10:06 +0000 (22:10 +0000)]
Merge \"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\" into nyc-dev
am:
488042fe3b
Change-Id: Ia41b8b2acbe3897423ac27881f3419efcfeeb002
Victor Chang [Thu, 14 Jul 2016 22:09:59 +0000 (22:09 +0000)]
Merge \"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\" into nyc-dev
am:
488042fe3b
Change-Id: I4d542c19e057b044544a2ed4f07b9c2cc5866f0f
Alan Leung [Wed, 13 Jul 2016 17:59:54 +0000 (10:59 -0700)]
Fix thread priority after boosting.
The previous CL wrongly restores all priority to nice 0.
This CL changes two things:
1. It remembers and restores the previous priority.
2. If the thread has priority of < -2. Do not set it to -2.
BUG:
29930920
Change-Id: I927e060d789c9bbf92f6a166f44317d9db0f5205
Victor Chang [Thu, 14 Jul 2016 22:04:10 +0000 (22:04 +0000)]
Merge "Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set" into nyc-dev
Chris Craik [Thu, 14 Jul 2016 21:24:16 +0000 (14:24 -0700)]
Fix rotated clip regions
bug:
26562461
fixes:
30109912
SeekBar clips out the area of the thumb when drawing its track. This
creates a clip region, since a rect has been subtracted.
This changes region transform support in computing final clip to
properly support any rect-to-rect transform (such as 90 degree rotation)
when applying a clip region.
Change-Id: Ib3bbc52637e59e00b3a7e7d5c4c40555e26c578b
Selim Cinek [Thu, 14 Jul 2016 18:16:58 +0000 (11:16 -0700)]
Fixed the heads up disspearing bug for real
When children become unisolated, they could be stuck in heads up mode.
Change-Id: I18227ae6743abec8fd6dc75916c67549f9e0aac4
Fixes:
30120962
Selim Cinek [Thu, 14 Jul 2016 01:50:04 +0000 (18:50 -0700)]
Fixed a bug where the header was positioned wrong
Also cleaned up some logic about the translation
Change-Id: I6bfcb36ac27d8d6280e8ffea62b597d3bc705121
Fixes:
29880654
Android Build Merger (Role) [Thu, 14 Jul 2016 20:51:57 +0000 (20:51 +0000)]
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
9cdfb9d781 -s ours am:
60c459ff05 -s ours" into nyc-mr1-dev-plus-aosp
Bill Yi [Thu, 14 Jul 2016 20:51:21 +0000 (20:51 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
9cdfb9d781 -s ours
am:
87df5f6ded -s ours
Change-Id: I76787013cb8774e862b7501852604d2c666f68c9
Bill Yi [Thu, 14 Jul 2016 20:51:20 +0000 (20:51 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
9cdfb9d781 -s ours
am:
60c459ff05 -s ours
Change-Id: I41ae231a6db88832a05674e20c8aa5e0fcac2c56
Bill Yi [Thu, 14 Jul 2016 20:47:18 +0000 (20:47 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
9cdfb9d781 -s ours
Change-Id: I861d47e86d5695382ecf2e3093e567f710273c1c
Bill Yi [Thu, 14 Jul 2016 20:46:02 +0000 (20:46 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
9cdfb9d781 -s ours
Change-Id: Ib5e9579d28d84fa2fa26910fb6857b06b2d09560
TreeHugger Robot [Thu, 14 Jul 2016 20:39:48 +0000 (20:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Thu, 14 Jul 2016 20:31:54 +0000 (20:31 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
a035048d35 -s ours
Change-Id: I233dad03d066fea8fd951247360e687f4c2ae84c
TreeHugger Robot [Thu, 14 Jul 2016 20:27:16 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Jason Monk [Thu, 14 Jul 2016 20:22:43 +0000 (20:22 +0000)]
Merge \"Add LTE+ and update 4G+ icons\" into nyc-mr1-dev
am:
5768a5dd30
Change-Id: I475dbf0263569f1112c6b43613ef9a26e4bfcd0f
Jeff Sharkey [Thu, 14 Jul 2016 20:14:31 +0000 (20:14 +0000)]
Merge \"Require permission for FLAG_WILL_BE_FOREGROUND.\" into nyc-mr1-dev
am:
97639a1310
Change-Id: I90756b855879cf37bc0bca86844fe99f8a62ef25
TreeHugger Robot [Thu, 14 Jul 2016 20:08:58 +0000 (20:08 +0000)]
Merge "Add LTE+ and update 4G+ icons" into nyc-mr1-dev
Wale Ogunwale [Thu, 14 Jul 2016 20:06:43 +0000 (20:06 +0000)]
Merge \"Allow no longer waiting for visible activity to be stopped.\" into nyc-mr1-dev
am:
5ac1b52aaa
Change-Id: I10b9fc8a66041f32dcfae62cf70ca0315a0185f7
TreeHugger Robot [Thu, 14 Jul 2016 20:05:37 +0000 (20:05 +0000)]
Merge "Require permission for FLAG_WILL_BE_FOREGROUND." into nyc-mr1-dev
TreeHugger Robot [Thu, 14 Jul 2016 19:55:12 +0000 (19:55 +0000)]
Merge "Allow no longer waiting for visible activity to be stopped." into nyc-mr1-dev
Carlos Valdivia [Thu, 14 Jul 2016 19:33:41 +0000 (19:33 +0000)]
Merge \"Only broadcast LOGIN_ACCOUNTS_CHANGED when changes occur.\" into nyc-mr1-dev
am:
327c7e4c06
Change-Id: Id321433f4417eaaffb03d123bd2ed16e94255e93
Justin Klaassen [Thu, 14 Jul 2016 19:33:35 +0000 (19:33 +0000)]
Merge \"Refactor display color transforms\" into nyc-mr1-dev
am:
94673f0b7c
Change-Id: I7fdf83db6cbf26cdc5b8a9971fa48b7f8458474d
Android Build Merger (Role) [Thu, 14 Jul 2016 19:23:55 +0000 (19:23 +0000)]
Merge "Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b am:
bab3334226 am:
ff58d7c918 -s ours am:
437776ac65 am:
7c19aa73f7" into nyc-mr1-dev-plus-aosp
Sergio Giro [Thu, 14 Jul 2016 19:23:33 +0000 (19:23 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b am:
bab3334226 am:
ff58d7c918 -s ours am:
437776ac65
am:
7c19aa73f7
Change-Id: Icf8516eb92a8ad38579cdf3483e6892f37ad6b95
Sergio Giro [Thu, 14 Jul 2016 19:23:21 +0000 (19:23 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b am:
bab3334226 am:
ff58d7c918 -s ours am:
437776ac65
am:
73b29dc307
Change-Id: I4f294d6a5a85d4c1fd14e392020b14bc57c90e95
Carlos Valdivia [Thu, 14 Jul 2016 19:11:02 +0000 (19:11 +0000)]
Merge "Only broadcast LOGIN_ACCOUNTS_CHANGED when changes occur." into nyc-mr1-dev
Justin Klaassen [Thu, 14 Jul 2016 18:55:30 +0000 (18:55 +0000)]
Merge "Refactor display color transforms" into nyc-mr1-dev
Sergio Giro [Thu, 14 Jul 2016 18:48:57 +0000 (18:48 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b am:
bab3334226 am:
ff58d7c918 -s ours
am:
437776ac65
Change-Id: I5cfc049e64fd76fc865dcaf04590e3f665dc91f4
Sergio Giro [Thu, 14 Jul 2016 18:48:55 +0000 (18:48 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b am:
bab3334226 am:
ff58d7c918 -s ours
am:
437776ac65
Change-Id: Ic88ad611257693f8f5691e48493ed0ac46a1a45a
Sergio Giro [Thu, 14 Jul 2016 18:42:45 +0000 (18:42 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b am:
bab3334226
am:
ff58d7c918 -s ours
Change-Id: I31000817d4f99c215277d580948a20194176d53e
Felipe Leme [Thu, 14 Jul 2016 18:35:45 +0000 (18:35 +0000)]
Merge \\"Fixed statuses on Battery Saver column.\\" into nyc-dev am:
24b2e7bbee
am:
bc84c54a2b
Change-Id: I6fdb61d652acba14c8e66bdfce0019701d8bb465
Android Build Merger (Role) [Thu, 14 Jul 2016 18:31:17 +0000 (18:31 +0000)]
Merge "Merge \\"Fixed statuses on Battery Saver column.\\" into nyc-dev am:
24b2e7bbee am:
28318faf16" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 14 Jul 2016 18:31:04 +0000 (18:31 +0000)]
Merge "delete old Community page, redirect to Support page am:
845cf07bdd am:
c5084eac0f" into nyc-mr1-dev-plus-aosp
OSDN Git Service
