OSDN Git Service
Hugo Benichi [Fri, 15 Jul 2016 04:11:33 +0000 (04:11 +0000)]
Merge \\"APF: filter unwanted ARP replies\\" into nyc-mr1-dev am:
b91c1232ee
am:
599c9c764e
Change-Id: Ic45bd53872102c7e6fdf02a79d29f82744ee1695
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
TreeHugger Robot [Fri, 15 Jul 2016 03:35:49 +0000 (03:35 +0000)]
Merge "Addition UserInputHandler test coverage."
Chris Tate [Fri, 15 Jul 2016 01:58:04 +0000 (01:58 +0000)]
Merge \\"Thread-safe pipe teardown during restore operations\\" into nyc-mr1-dev am:
4595bc7f12
am:
f74ff47988
Change-Id: I562d94384d4ca4d788c704aca64fa16b613d38e8
Chris Tate [Fri, 15 Jul 2016 01:58:02 +0000 (01:58 +0000)]
Merge \\"Dump the source uid of scheduled jobs\\" into nyc-mr1-dev am:
b30e1f75d1
am:
562d906f95
Change-Id: I9bb1e812fec40f1f3a7556780d8fab54cd21eea9
Chris Tate [Fri, 15 Jul 2016 01:57:59 +0000 (01:57 +0000)]
Merge \\"Test existence of wallpaper files before backing them up\\" into nyc-mr1-dev am:
8b08553e90
am:
4a74ffc1b5
Change-Id: I897aec4788c757ffdf1982f9b4c9dee3c29f2433
Selim Cinek [Fri, 15 Jul 2016 01:57:57 +0000 (01:57 +0000)]
Merge \\"Fixed a bug where the burmese clock could overlap\\" into nyc-mr1-dev am:
f25486f8a5
am:
a8c8cf5314
Change-Id: I80a521699b870eeb57085f610e6ddedd44071273
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
Steve McKay [Wed, 13 Jul 2016 20:03:16 +0000 (13:03 -0700)]
Addition UserInputHandler test coverage.
Pull event handling logic out of MultiSelectManager into UserInputHandler.
Pull out a couple common test support classes.
Change-Id: I8958fec9cda05f52192a07a682c318e049871a8d
Makoto Onuki [Fri, 15 Jul 2016 00:55:59 +0000 (00:55 +0000)]
Merge \\"Handle locale change and pacakge change in different way\\" into nyc-mr1-dev am:
83fa7a8255
am:
22963b8937
Change-Id: I39da795eeed8bb3d0e53b0ed02663cce1088cabf
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
Lajos Molnar [Fri, 15 Jul 2016 00:39:10 +0000 (00:39 +0000)]
Merge \\"media: clarify notes in MediaCodec doc\\" into nyc-mr1-dev am:
82d886434d
am:
1d356c895b
Change-Id: I086a5de8bb581d5d908dacee82e4d93403e73320
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:19:25 +0000 (00:19 +0000)]
Merge \\"Fixed the heads up disspearing bug for real\\" into nyc-mr1-dev am:
70b06cc62f
am:
58526c8391
Change-Id: I4d60c9ee527228541d393f725854081ac13f3c91
Justin Klaassen [Fri, 15 Jul 2016 00:13:54 +0000 (00:13 +0000)]
Merge \\"Don\\'t activate Night display until user setup is complete\\" into nyc-mr1-dev am:
6028472b8a
am:
21558d12d8
Change-Id: Ib6b196dc54affb5e18580cdbff3b5c1016ab329b
Chris Craik [Fri, 15 Jul 2016 00:13:50 +0000 (00:13 +0000)]
Merge \\"Fix rotated clip regions\\" into nyc-mr1-dev am:
06f13cba5f
am:
d5cdbdeae1
Change-Id: Ib7db5a8fbbe4cfdd8cd7c8a06ad51477fc6df5a1
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:55:37 +0000 (23:55 +0000)]
Merge \\"Fix bug where swiping on the fp sensor when the screen is off causes blank screen\\" into nyc-mr1-dev am:
538b836e05
am:
ba350f3512
Change-Id: Ia83a8afd2d55f53b90b17307e3214ee581de9ca6
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
Christopher Wiley [Thu, 14 Jul 2016 23:40:55 +0000 (23:40 +0000)]
Merge \\"Properly disable WiFi tethering\\" into nyc-mr1-dev am:
f3d9863d5e
am:
7c3fe775f2
Change-Id: I3f46d2263dc8d247590a0b37aa9b53ca74807262
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
TreeHugger Robot [Thu, 14 Jul 2016 23:26:00 +0000 (23:26 +0000)]
Merge "Fix a race and some comments in ClipStorage."
Selim Cinek [Thu, 14 Jul 2016 23:09:15 +0000 (23:09 +0000)]
Merge \\"Fixed a bug where the header was positioned wrong\\" into nyc-mr1-dev am:
b1008221f9
am:
c489f0bf06
Change-Id: I227c36c3384a08d395b58b146be9b7070072ff60
Philip Cuadra [Thu, 14 Jul 2016 23:04:36 +0000 (23:04 +0000)]
Merge \\"Call into ART to get the location of the odex/oat file to pin\\" into nyc-mr1-dev am:
8b072fbd48
am:
1510a6981b
Change-Id: Ia7450bbc482a375dcc030ee5fc32ef17670d1d50
Raph Levien [Thu, 14 Jul 2016 22:59:28 +0000 (22:59 +0000)]
Merge \\"Don\\'t count zero width space in hasGlyph layout\\" into nyc-mr1-dev am:
f9c8893d1b
am:
3fabee6f41 -s ours
Change-Id: I12897c0e574a16c48ae35f2c48f680d163b3d670
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
Raph Levien [Thu, 14 Jul 2016 22:50:53 +0000 (22:50 +0000)]
Merge \\"Treat U+2695, U+2640, U+2642 as emoji characters.\\" into nyc-mr1-dev am:
c0ab2e83ac
am:
d6acdcee26
Change-Id: I6f989b1a3d4a9a326ab129b507f0bb9093115cff
Raph Levien [Thu, 14 Jul 2016 22:50:50 +0000 (22:50 +0000)]
Merge \\"Delete gender-balanced emoji sequence by one backspace key event.\\" into nyc-mr1-dev am:
ef9e2a5f4b
am:
dc8ad8d49d
Change-Id: I7c140ee5bdbd1dba4cfcbc824ecfeef9861f7853
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
Raph Levien [Thu, 14 Jul 2016 22:37:50 +0000 (22:37 +0000)]
Merge \\"Patch out part of the emoji tests.\\" into nyc-mr1-dev am:
2f39bc777c
am:
a77343f873
Change-Id: I60cc91a65e818cb78663647bfa249c896a7cff2c
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
Sandra Kwan [Thu, 14 Jul 2016 22:31:31 +0000 (22:31 +0000)]
Merge "Allows AccountManager to start exported activities."
TreeHugger Robot [Thu, 14 Jul 2016 22:30:43 +0000 (22:30 +0000)]
Merge "Import translations. DO NOT MERGE"
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
Sandra Kwan [Thu, 30 Jun 2016 21:34:01 +0000 (14:34 -0700)]
Allows AccountManager to start exported activities.
We prevent authenticators from using Settings to launch arbitrary
activities by checking if the activity has the same signature with the
authenticators. However, some activities
(GrantCredentialsPermissionActivity and CantAddAccountActivity) are
returned by AccountManagerService and should be allowed to start.
Bug:
18864662
Change-Id: I20c17f0864e6cee1cca901514da2638f551e5423
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
Victor Chang [Thu, 14 Jul 2016 22:26:15 +0000 (22:26 +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
am:
8d3090466b
Change-Id: I673f011dd476e1825620e1eb1bcdf80f66540d23
Victor Chang [Thu, 14 Jul 2016 22:26:09 +0000 (22:26 +0000)]
Merge \\\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\\" into nyc-dev am:
488042fe3b am:
07e11c3ae9
am:
0e06694e35
Change-Id: I3a43e63966f48964af9a9a53fb33de7a995a21d8
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
TreeHugger Robot [Thu, 14 Jul 2016 22:10:45 +0000 (22:10 +0000)]
Merge "AAPT2: Remove usage of u16string"
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
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
Bill Yi [Thu, 14 Jul 2016 21:16:51 +0000 (21:16 +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
am:
7ee42eb900 -s ours
Change-Id: I372738bad2258250f1fd803be9fad946d8bff977
Chong Zhang [Thu, 14 Jul 2016 21:10:42 +0000 (21:10 +0000)]
Merge "Remove mFocusedActivity in AM and only keep focused stack"
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
Garfield, Tan [Thu, 14 Jul 2016 17:42:03 +0000 (10:42 -0700)]
Fix a race and some comments in ClipStorage.
Change-Id: I6cc2108c677ce6611f5ebef70a88b625491a2e05
Android Build Merger (Role) [Thu, 14 Jul 2016 21:02:15 +0000 (21:02 +0000)]
Merge "Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am:
9cdfb9d781 -s ours am:
87df5f6ded -s ours am:
1d08ee2d8a -s ours"
Bill Yi [Thu, 14 Jul 2016 21:01:56 +0000 (21:01 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am:
9cdfb9d781 -s ours am:
87df5f6ded -s ours
am:
1d08ee2d8a -s ours
Change-Id: I6853c0adf9b512eeb8460909cca722d58d3c5879
TreeHugger Robot [Thu, 14 Jul 2016 21:00:49 +0000 (21:00 +0000)]
Merge "PopupWindow: Be more consistent about Gravity calculation."
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:38:55 +0000 (20:38 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am:
a035048d35 -s ours
am:
e9de42ac9c -s ours
Change-Id: I55017d652a1cbdc52bf7ceffa3bba375c28a6a48
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
Android Build Merger (Role) [Thu, 14 Jul 2016 20:31:48 +0000 (20:31 +0000)]
Merge "Merge \\"Add LTE+ and update 4G+ icons\\" into nyc-mr1-dev am:
5768a5dd30 am:
a98d09462a"
TreeHugger Robot [Thu, 14 Jul 2016 20:31:29 +0000 (20:31 +0000)]
Merge "Import translations. DO NOT MERGE"
Jason Monk [Thu, 14 Jul 2016 20:31:24 +0000 (20:31 +0000)]
Merge \\"Add LTE+ and update 4G+ icons\\" into nyc-mr1-dev am:
5768a5dd30
am:
a98d09462a
Change-Id: I8e88b9fee51729347a7273051ff1f388ebac8612
TreeHugger Robot [Thu, 14 Jul 2016 20:27:16 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Jeff Sharkey [Thu, 14 Jul 2016 20:22:54 +0000 (20:22 +0000)]
Merge \\"Require permission for FLAG_WILL_BE_FOREGROUND.\\" into nyc-mr1-dev am:
97639a1310
am:
aa8ae41aa5
Change-Id: Icfe17015febaa13823bf9c6d35c33a09d39e7462
Wale Ogunwale [Thu, 14 Jul 2016 20:22:51 +0000 (20:22 +0000)]
Merge \\"Allow no longer waiting for visible activity to be stopped.\\" into nyc-mr1-dev am:
5ac1b52aaa
am:
a561d28bdd
Change-Id: I471dd78e6a06f1bfd45f7d59c4bbe4efaa518561
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
Carlos Valdivia [Thu, 14 Jul 2016 20:09:55 +0000 (20:09 +0000)]
Merge \\"Only broadcast LOGIN_ACCOUNTS_CHANGED when changes occur.\\" into nyc-mr1-dev am:
327c7e4c06
am:
bdaed68189
Change-Id: I01422e3ee0d726b7db279f5038d04474bb62571d
Justin Klaassen [Thu, 14 Jul 2016 20:09:52 +0000 (20:09 +0000)]
Merge \\"Refactor display color transforms\\" into nyc-mr1-dev am:
94673f0b7c
am:
5f3bf63121
Change-Id: I06a60ef4a1fa23e0c1f5b6ab97462811b6aaf239
Sergio Giro [Thu, 14 Jul 2016 20:09:49 +0000 (20:09 +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
am:
1072978c6a
Change-Id: I1b5c8149c042b29f1b860efc56dc61dab25a04b5
Sergio Giro [Thu, 14 Jul 2016 20:09:47 +0000 (20:09 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b am:
bab3334226 am:
ff58d7c918 -s ours am:
437776ac65 am:
73b29dc307
am:
12128035ae
Change-Id: I9742f3ba3c1aaf1547aee3d0c2ccf1887d7b3f70
OSDN Git Service
