OSDN Git Service
Tyler Gunn [Wed, 17 Aug 2016 21:29:06 +0000 (21:29 +0000)]
Merge "Add Telephony Connection event for handover from WIFI to LTE." into nyc-mr1-dev am:
36863797cd
am:
cb8e493169
Change-Id: I2bc975912578bd9918c0d0d79bf0b85ab273a61f
Tyler Gunn [Wed, 17 Aug 2016 21:28:19 +0000 (21:28 +0000)]
Add Telephony Connection event for handover from WIFI to LTE. am:
481255dc1c
am:
984a1efd2a
Change-Id: Ic2da4b4fefd06fa24913ce234f0a10393714fc47
Tyler Gunn [Wed, 17 Aug 2016 21:23:38 +0000 (21:23 +0000)]
Merge "Add Telephony Connection event for handover from WIFI to LTE." into nyc-mr1-dev
am:
36863797cd
Change-Id: I14c02ea467928e54191142fd84d58e0be8a5e84f
Tyler Gunn [Wed, 17 Aug 2016 21:23:32 +0000 (21:23 +0000)]
Add Telephony Connection event for handover from WIFI to LTE.
am:
481255dc1c
Change-Id: I52676d0814db22cf9d6673e31aa7a71cdf155e81
Tyler Gunn [Wed, 17 Aug 2016 21:19:41 +0000 (21:19 +0000)]
Merge "Add Telephony Connection event for handover from WIFI to LTE." into nyc-mr1-dev
Glenn Kasten [Wed, 17 Aug 2016 21:10:59 +0000 (21:10 +0000)]
resolve merge conflicts of
c76a3ac to stage-aosp-master am:
67ffd5e617
am:
f7b4fd24e3
Change-Id: Ib06db403955ae0056c1fee0e09f9249d0b887ea1
Glenn Kasten [Wed, 17 Aug 2016 21:07:54 +0000 (21:07 +0000)]
resolve merge conflicts of
c76a3ac to stage-aosp-master
am:
67ffd5e617
Change-Id: Ib2d89672efe8757edff320d5ed800b7b0293323b
Phil Weaver [Wed, 17 Aug 2016 21:02:34 +0000 (21:02 +0000)]
Merge "Restart accessibility services after they update." into nyc-mr1-dev am:
ee4ff424ea
am:
e23405f5cd
Change-Id: I6056201e52039233ddeb6f9f2ae32ddb8752adb3
Phil Weaver [Wed, 17 Aug 2016 21:02:30 +0000 (21:02 +0000)]
Restart accessibility services after they update. am:
1e6695bbd4
am:
fff4a144de
Change-Id: Ife63344494f27a68511c702536d373350e2b4b46
Phil Weaver [Wed, 17 Aug 2016 20:56:05 +0000 (20:56 +0000)]
Merge "Restart accessibility services after they update." into nyc-mr1-dev
am:
ee4ff424ea
Change-Id: I08cbe3ccb4a8b53ec2804ee51a01ad4a7a205eb3
Phil Weaver [Wed, 17 Aug 2016 20:56:02 +0000 (20:56 +0000)]
Restart accessibility services after they update.
am:
1e6695bbd4
Change-Id: I10714ce8ebc0b9ca6dd206a4a11e283704d668ae
Phil Weaver [Wed, 17 Aug 2016 20:52:04 +0000 (20:52 +0000)]
Merge "Restart accessibility services after they update." into nyc-mr1-dev
Glenn Kasten [Wed, 17 Aug 2016 20:27:29 +0000 (13:27 -0700)]
resolve merge conflicts of
c76a3ac to stage-aosp-master
Change-Id: Ifff16bdc42e8326f3f60cf4b92688c445cb4db25
Alan Viverette [Wed, 17 Aug 2016 20:24:03 +0000 (20:24 +0000)]
Merge "Announce the date for accessibility using EMMMMdy format" into nyc-mr1-dev am:
8ecc7f7303
am:
aac31ac988
Change-Id: I74d5fab21ae8bfb265fe508e229af86ca6a1a719
Alan Viverette [Wed, 17 Aug 2016 20:23:59 +0000 (20:23 +0000)]
Announce the date for accessibility using EMMMMdy format am:
a770530e12
am:
d239411420
Change-Id: I6c2323d6e17a6497bcab0161d745586feb96076c
Alan Viverette [Wed, 17 Aug 2016 20:20:28 +0000 (20:20 +0000)]
Merge "Announce the date for accessibility using EMMMMdy format" into nyc-mr1-dev
am:
8ecc7f7303
Change-Id: I5e1124d7fabc432058447a8df9f09620931c4486
Alan Viverette [Wed, 17 Aug 2016 20:20:25 +0000 (20:20 +0000)]
Announce the date for accessibility using EMMMMdy format
am:
a770530e12
Change-Id: Ibe201d5ad5d65348578f6d0153b6cbb6e7bfa0d9
Alan Viverette [Wed, 17 Aug 2016 20:14:32 +0000 (20:14 +0000)]
Merge "Announce the date for accessibility using EMMMMdy format" into nyc-mr1-dev
Hemal Patel [Wed, 17 Aug 2016 19:59:47 +0000 (19:59 +0000)]
Docs: Renamed Google Now to Google Voice Actions am:
86bbfaabdd am:
00ff40145d am:
97632afe5e
am:
0262d30f9d
Change-Id: I5c6dccb7c68369468bf44d21534a54b2e6d3fae4
Yohei Yukawa [Wed, 17 Aug 2016 19:59:42 +0000 (19:59 +0000)]
Merge "Make View#isTemporarilyDetached() less confusing" into nyc-mr1-dev am:
ca0ef33746
am:
05761b81f1
Change-Id: Iffba1f9f59c404a152a60bb08ca31cdb48d2c7dc
Yohei Yukawa [Wed, 17 Aug 2016 19:56:23 +0000 (19:56 +0000)]
Merge "Make View#isTemporarilyDetached() less confusing" into nyc-mr1-dev am:
4aa5325ba8
am:
b5fa15e57b
Change-Id: I4b04e47126e6e9069abb269e9d9da07a3d551406
Yohei Yukawa [Wed, 17 Aug 2016 19:55:47 +0000 (19:55 +0000)]
Make View#isTemporarilyDetached() less confusing am:
ed841cbdd7
am:
6bc17c7320
Change-Id: Iec61193cd1d1902aa9aad1ad9ac1d6f4944c748b
Hemal Patel [Wed, 17 Aug 2016 19:55:35 +0000 (19:55 +0000)]
Docs: Renamed Google Now to Google Voice Actions am:
86bbfaabdd am:
00ff40145d
am:
97632afe5e
Change-Id: I2a8a6618a80923857d4f91ef2f6c79728a4b6672
Yohei Yukawa [Wed, 17 Aug 2016 19:54:14 +0000 (19:54 +0000)]
Merge "Make View#isTemporarilyDetached() less confusing" into nyc-mr1-dev
am:
ca0ef33746
Change-Id: Id68955fa3127668b3403bb946ecb850f8e7a3d55
Hemal Patel [Wed, 17 Aug 2016 19:50:12 +0000 (19:50 +0000)]
Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs am:
c7902aa4bb am:
5e086dc3bb
am:
fbced4bfc7
Change-Id: I92b25718cc3f1e6a72faceb25d12fa89409dc8fe
Hemal Patel [Wed, 17 Aug 2016 19:50:10 +0000 (19:50 +0000)]
Docs: Renamed Google Now to Google Voice Actions am:
86bbfaabdd am:
00ff40145d
am:
413e261d9b
Change-Id: I4cb24481c2f1fd3db9911a5bcee96a5bb72efa2b
Yohei Yukawa [Wed, 17 Aug 2016 19:49:14 +0000 (19:49 +0000)]
Merge "Make View#isTemporarilyDetached() less confusing" into nyc-mr1-dev
am:
4aa5325ba8
Change-Id: Ib7f69a0dafe92592a623970aeb72b54ff2826e63
Yohei Yukawa [Wed, 17 Aug 2016 19:49:01 +0000 (19:49 +0000)]
Make View#isTemporarilyDetached() less confusing
am:
ed841cbdd7
Change-Id: I2df97c1babb9fc515295c527a18d9f88546dfad7
Hemal Patel [Wed, 17 Aug 2016 19:45:03 +0000 (19:45 +0000)]
Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs am:
c7902aa4bb
am:
5e086dc3bb
Change-Id: I78fcea831565d461550df03544531756c465ef1e
Hemal Patel [Wed, 17 Aug 2016 19:45:03 +0000 (19:45 +0000)]
Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs am:
c7902aa4bb
am:
5e086dc3bb
Change-Id: I68730df7e316e2bb9f58b7b9732a06222305bfea
Hemal Patel [Wed, 17 Aug 2016 19:44:58 +0000 (19:44 +0000)]
Docs: Renamed Google Now to Google Voice Actions am:
86bbfaabdd
am:
00ff40145d
Change-Id: Ib165d9d5dd73a9f84ae45f82cb17f04a172e6804
Hemal Patel [Wed, 17 Aug 2016 19:44:56 +0000 (19:44 +0000)]
Docs: Renamed Google Now to Google Voice Actions am:
86bbfaabdd
am:
00ff40145d
Change-Id: I5d289bec45dbb6a3c0c6fba7ff760fa111aa6622
Yohei Yukawa [Wed, 17 Aug 2016 19:41:37 +0000 (19:41 +0000)]
Merge "Make View#isTemporarilyDetached() less confusing" into nyc-mr1-dev
Hemal Patel [Wed, 17 Aug 2016 19:37:17 +0000 (19:37 +0000)]
Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs
am:
c7902aa4bb
Change-Id: I45943e80b869adc9017b0e8de116f10e3b710764
Hemal Patel [Wed, 17 Aug 2016 19:37:14 +0000 (19:37 +0000)]
Docs: Renamed Google Now to Google Voice Actions
am:
86bbfaabdd
Change-Id: If177e10f331ca5ade62005337956b0fa81a90f26
Hemal Patel [Wed, 17 Aug 2016 19:32:15 +0000 (19:32 +0000)]
Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs
Jorim Jaggi [Wed, 17 Aug 2016 18:54:29 +0000 (18:54 +0000)]
Merge "Fix a flicker when returning to the lockscreen" into nyc-mr1-dev am:
edddb17a67
am:
9b0c58b493
Change-Id: Iaac10c803c5b3b48de1c2c8ce857fa17bef305ab
Jorim Jaggi [Wed, 17 Aug 2016 18:54:20 +0000 (18:54 +0000)]
Fix a flicker when returning to the lockscreen am:
d11d1a9486
am:
afaf4ac7a9
Change-Id: I26eb19aba2c68fea5faa82bf1e41286b8999bf4a
Andrew Solovay [Wed, 17 Aug 2016 18:54:08 +0000 (18:54 +0000)]
docs: Docs for Support Library 24.2.0 release am:
085994c40d am:
39cc61a4db am:
4cb3b9a60e
am:
b074294332
Change-Id: I97b44921d587ce5a6c86a45e5de895afb3b752e4
Eric Schmidt [Wed, 17 Aug 2016 18:53:58 +0000 (18:53 +0000)]
docs: Fixed code snippet in notify-user/navigation.html am:
32cc6b7fb7 am:
c89c8c3e37 am:
707678d8c5
am:
a2036a2109
Change-Id: Id55478887f21abeaac4cab3c613e58510413202f
Erik Kline [Wed, 17 Aug 2016 18:53:48 +0000 (18:53 +0000)]
Better error handling when NetworkManagementService#untetherInterface() fails. am:
1f4278a67a
am:
121a238408
Change-Id: Ia6ba40f089a15f69329883bba9ada8654b456b16
Doris Liu [Wed, 17 Aug 2016 18:42:57 +0000 (18:42 +0000)]
Merge "Fix listeners not getting called when AVD falls back on UI thread" into nyc-mr1-dev am:
69115b8e29
am:
ccc3794f77
Change-Id: I0e4fea7a87e84d7a211d90380f07ad117fddd4d1
Doris Liu [Wed, 17 Aug 2016 18:42:54 +0000 (18:42 +0000)]
Fix listeners not getting called when AVD falls back on UI thread am:
853b23d1fa
am:
79846f859c
Change-Id: I8f8a70a35f9b6ea75ae627af8235a0fe65802551
Erik Kline [Wed, 17 Aug 2016 18:42:50 +0000 (18:42 +0000)]
Merge "Support tethering IPv6 toward the first requested downstream." into nyc-mr1-dev am:
caf7d3f447
am:
a4e219b9d2
Change-Id: If82fc1e1dfe3a5ae4ffd259a1418c66a52a753ad
Erik Kline [Wed, 17 Aug 2016 18:42:47 +0000 (18:42 +0000)]
Support tethering IPv6 toward the first requested downstream. am:
6e29bf0069
am:
ea6634fb11
Change-Id: I60fff390f3142c7a5e4336816b56b4e18aa2122e
Fan Zhang [Wed, 17 Aug 2016 18:42:42 +0000 (18:42 +0000)]
Merge "Allow configurable data warning for BillingCyclerPreference" into nyc-mr1-dev am:
f1e87a2003
am:
3800b74013
Change-Id: I6c57431a4e288459e58ee02de3e5a5967f955e85
Android Build Merger (Role) [Wed, 17 Aug 2016 18:35:22 +0000 (18:35 +0000)]
Merge changes from topics 'am-
f4b13b8a7d3047959d28636f972cde03', 'am-
709ecf5e9d934415bd2b800c61a87867' into nyc-mr1-dev-plus-aosp
* changes:
Allow configurable data warning for BillingCyclerPreference am:
70196d84a6 am:
0060d55f95
Merge "Adds a CNAP filtering field to the CarrierConfig" into nyc-mr1-dev am:
fb599587a1 am:
c9457e184b
Adds a CNAP filtering field to the CarrierConfig am:
5ea6b1ece9 am:
8dc27c8f40
Merge "Fixed the animation of the no notifications view" into nyc-mr1-dev am:
a9663254ac am:
0a0e5e47ff
Fixed the animation of the no notifications view am:
a9d3efd194 am:
5e5a78fc56
Merge "Define low latency output stream (formerly primary)" into nyc-mr1-dev am:
46db227b84 am:
209fabdd3e
Define low latency output stream (formerly primary) am:
2ed8f215f1 am:
caea5a683b
Fan Zhang [Wed, 17 Aug 2016 18:30:59 +0000 (18:30 +0000)]
Allow configurable data warning for BillingCyclerPreference am:
70196d84a6
am:
0060d55f95
Change-Id: Ifbd834766ca62265a6eba9a57e34b5e8f2ae03d9
Brad Ebinger [Wed, 17 Aug 2016 18:30:24 +0000 (18:30 +0000)]
Merge "Adds a CNAP filtering field to the CarrierConfig" into nyc-mr1-dev am:
fb599587a1
am:
c9457e184b
Change-Id: Ib2272d72315401cf66514c3f1410c5c698189531
Jorim Jaggi [Wed, 17 Aug 2016 18:29:04 +0000 (18:29 +0000)]
Merge "Fix a flicker when returning to the lockscreen" into nyc-mr1-dev
am:
edddb17a67
Change-Id: Id177f424d927c1ed8f637b3c24477e90080a94f0
Jorim Jaggi [Wed, 17 Aug 2016 18:28:59 +0000 (18:28 +0000)]
Fix a flicker when returning to the lockscreen
am:
d11d1a9486
Change-Id: Ia0b617be2bb00db24115f04f362cd072d59ebe71
Brad Ebinger [Wed, 17 Aug 2016 18:28:58 +0000 (18:28 +0000)]
Adds a CNAP filtering field to the CarrierConfig am:
5ea6b1ece9
am:
8dc27c8f40
Change-Id: Ia35252ae72c26b29db792a870c4537b2cd6ddddb
Selim Cinek [Wed, 17 Aug 2016 18:28:12 +0000 (18:28 +0000)]
Merge "Fixed the animation of the no notifications view" into nyc-mr1-dev am:
a9663254ac
am:
0a0e5e47ff
Change-Id: Idf72edd2364f9a77ae82ce498f0f68bc3355b53f
Chih-hung Hsieh [Wed, 17 Aug 2016 18:28:00 +0000 (18:28 +0000)]
Merge "Fix google-explicit-constructor warnings in common_time." am:
67d47e0ca6 am:
9b36ce973e
am:
f121917e51
Change-Id: Id90b589066e93fee5f956dc2bf31e1e8405a5d5c
Selim Cinek [Wed, 17 Aug 2016 18:27:34 +0000 (18:27 +0000)]
Fixed the animation of the no notifications view am:
a9d3efd194
am:
5e5a78fc56
Change-Id: Id1dc8db7bfd6be2f0d0892f9c0b4c2b06c878c16
Glenn Kasten [Wed, 17 Aug 2016 18:26:50 +0000 (18:26 +0000)]
Merge "Define low latency output stream (formerly primary)" into nyc-mr1-dev am:
46db227b84
am:
209fabdd3e
Change-Id: Ibec333bf6408847d8c7b1399c3680db8c17d5f72
Glenn Kasten [Wed, 17 Aug 2016 18:25:32 +0000 (18:25 +0000)]
Define low latency output stream (formerly primary) am:
2ed8f215f1
am:
caea5a683b
Change-Id: I459a9fb99c11cb252232b7192355564d43397f04
Android Build Merger (Role) [Wed, 17 Aug 2016 18:24:11 +0000 (18:24 +0000)]
Merge "Merge "Add new window type TYPE_DRAWN_APPLICATION" into nyc-mr1-dev am:
f925b8df92 am:
f420c7cbd4" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 17 Aug 2016 18:23:58 +0000 (18:23 +0000)]
Merge "Add new window type TYPE_DRAWN_APPLICATION am:
fea963edee am:
5e09ceb641" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 17 Aug 2016 18:23:45 +0000 (18:23 +0000)]
Merge "Merge "Add null check to KeyEventDispatcher." into nyc-mr1-dev am:
49b684d562 am:
b126ddb917" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 17 Aug 2016 18:23:32 +0000 (18:23 +0000)]
Merge "Add null check to KeyEventDispatcher. am:
2a0e48aaf5 am:
2aab159e33" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 17 Aug 2016 18:23:17 +0000 (18:23 +0000)]
Merge "Merge "Fixed a bug where the summary could become visible even if it was suppressed" into nyc-mr1-dev am:
e68228fbd9 am:
225bedbc86" into nyc-mr1-dev-plus-aosp
Chong Zhang [Wed, 17 Aug 2016 18:22:14 +0000 (18:22 +0000)]
Merge "Add new window type TYPE_DRAWN_APPLICATION" into nyc-mr1-dev am:
f925b8df92
am:
f420c7cbd4
Change-Id: Iae7e055d656e2b0a76107e07f2061c261a53b773
Chong Zhang [Wed, 17 Aug 2016 18:22:10 +0000 (18:22 +0000)]
Add new window type TYPE_DRAWN_APPLICATION am:
fea963edee
am:
5e09ceb641
Change-Id: I955b985c47ca10a17dec6921af0277d1d6a7431d
Phil Weaver [Wed, 17 Aug 2016 18:22:04 +0000 (18:22 +0000)]
Merge "Add null check to KeyEventDispatcher." into nyc-mr1-dev am:
49b684d562
am:
b126ddb917
Change-Id: I3b2c79f8b967f7db4f565e56cf82313ed892945d
Phil Weaver [Wed, 17 Aug 2016 18:22:00 +0000 (18:22 +0000)]
Add null check to KeyEventDispatcher. am:
2a0e48aaf5
am:
2aab159e33
Change-Id: Ib06fc038c6322bbb9d8cb090abb89f71018be10a
Selim Cinek [Wed, 17 Aug 2016 18:21:56 +0000 (18:21 +0000)]
Merge "Fixed a bug where the summary could become visible even if it was suppressed" into nyc-mr1-dev am:
e68228fbd9
am:
225bedbc86
Change-Id: I9e988c9e48c1ceca17589bef18e7e3846cd89b60
Android Build Merger (Role) [Wed, 17 Aug 2016 18:21:08 +0000 (18:21 +0000)]
Merge "Fixed a bug where the summary could become visible even if it was suppressed am:
80c44dd800 am:
b665b73437" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 17 Aug 2016 18:20:55 +0000 (18:20 +0000)]
Merge "Merge "NavBar: Use rotation watcher" into nyc-mr1-dev am:
27c3c34fe1 am:
9f36729f4d" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 17 Aug 2016 18:20:39 +0000 (18:20 +0000)]
Merge "NavBar: Use rotation watcher am:
a98b32cea2 am:
c5d9eb8ebd" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 17 Aug 2016 18:20:15 +0000 (18:20 +0000)]
Merge changes from topic 'am-
0fee4bce4d374519bf38ae18517a4d79' into nyc-mr1-dev-plus-aosp
* changes:
Merge "Support auto-downgrade to audio when data disabled." into nyc-mr1-dev am:
76c973cda0 am:
464eb12320
Support auto-downgrade to audio when data disabled. am:
86d5c3fcde am:
6c678716e4
Selim Cinek [Wed, 17 Aug 2016 18:18:48 +0000 (18:18 +0000)]
Fixed a bug where the summary could become visible even if it was suppressed am:
80c44dd800
am:
b665b73437
Change-Id: If10fcd405843f8e84e1512970b58186af5965948
Adrian Roos [Wed, 17 Aug 2016 18:18:44 +0000 (18:18 +0000)]
Merge "NavBar: Use rotation watcher" into nyc-mr1-dev am:
27c3c34fe1
am:
9f36729f4d
Change-Id: Ic82cf732a685f2f3730594ec0880727ce2d4a0fa
Adrian Roos [Wed, 17 Aug 2016 18:18:39 +0000 (18:18 +0000)]
NavBar: Use rotation watcher am:
a98b32cea2
am:
c5d9eb8ebd
Change-Id: I599c828ade63e93b0d71a3a1b5e96670c7a40ea1
Eric Schmidt [Wed, 17 Aug 2016 18:18:33 +0000 (18:18 +0000)]
docs: Fixed code snippet in notify-user/navigation.html am:
32cc6b7fb7 am:
39cc61a4db
am:
2367fb1c56
Change-Id: Ibbca09bc1667ba02e9c6d99f39350ca8bb6d5e61
Tyler Gunn [Wed, 17 Aug 2016 18:18:33 +0000 (18:18 +0000)]
Merge "Support auto-downgrade to audio when data disabled." into nyc-mr1-dev am:
76c973cda0
am:
464eb12320
Change-Id: Ibab9f79cfb09cb41e56c549549539eaffb16bcb2
Chih-hung Hsieh [Wed, 17 Aug 2016 18:18:22 +0000 (18:18 +0000)]
Merge "Fix google-explicit-constructor warnings in common_time." am:
67d47e0ca6
am:
9b36ce973e
Change-Id: I8a9e9d09a48da636a8256aec1c0000441d986d4e
Tyler Gunn [Wed, 17 Aug 2016 18:17:59 +0000 (18:17 +0000)]
Support auto-downgrade to audio when data disabled. am:
86d5c3fcde
am:
6c678716e4
Change-Id: I0a488516d7e9f1a90b91bd46d6f9a8a27f7f8a61
TreeHugger Robot [Wed, 17 Aug 2016 18:11:45 +0000 (18:11 +0000)]
Merge "Fix a flicker when returning to the lockscreen" into nyc-mr1-dev
Jorim Jaggi [Tue, 16 Aug 2016 23:02:32 +0000 (16:02 -0700)]
Fix a flicker when returning to the lockscreen
If we return to the lockscreen from a FLAG_SHOW_WHEN_LOCKED activity,
there was an additional black flicker as the wallpaper wasn't shown
for a couple of frames. The issue is that we didn't set the wallpaper
flag again, to fix another flicker with lockscreen wallpapers. Now,
we pass the state whether we currently have a lockscreen wallpaper
and if we don't have one, we immediately set the wallpaper flag
again.
Bug:
30829255
Bug:
30883413
Change-Id: I9faeaa77b98eb02058171ce19cf90b43826ebe9e
Android Build Merger (Role) [Wed, 17 Aug 2016 18:07:23 +0000 (18:07 +0000)]
Merge "Merge "Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master am:
6f15eabd29" into nyc-dev-plus-aosp am:
8fa05abfab" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 17 Aug 2016 18:07:08 +0000 (18:07 +0000)]
Merge "Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master am:
6f15eabd29 am:
150ab094ed" into nyc-mr1-dev-plus-aosp
Eric Schmidt [Wed, 17 Aug 2016 18:06:55 +0000 (18:06 +0000)]
docs: Fixed code snippet in notify-user/navigation.html am:
32cc6b7fb7
am:
39cc61a4db
Change-Id: I68dd3b9ebc95fe57fe9e4553f87774c69bb10df1
Android Build Merger (Role) [Wed, 17 Aug 2016 18:06:52 +0000 (18:06 +0000)]
Merge "Merge "docs: Fixed code snippet in notify-user/navigation.html am:
32cc6b7fb7 am:
c89c8c3e37" into nyc-dev-plus-aosp am:
d604595820" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 17 Aug 2016 18:06:39 +0000 (18:06 +0000)]
Merge "Merge "Replace android auto assets with the latest" into nyc-mr1-dev am:
91ef993e2d am:
8f7f6abd09" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 17 Aug 2016 18:06:26 +0000 (18:06 +0000)]
Merge "docs: Fixed code snippet in notify-user/navigation.html am:
32cc6b7fb7 am:
c89c8c3e37 am:
97b75e6ce9" into nyc-mr1-dev-plus-aosp
Chih-hung Hsieh [Wed, 17 Aug 2016 18:06:22 +0000 (18:06 +0000)]
Merge "Fix google-explicit-constructor warnings in common_time."
am:
67d47e0ca6
Change-Id: I2548e50d2654d3dfacd175b4db118983848bf15c
Android Build Merger (Role) [Wed, 17 Aug 2016 18:06:15 +0000 (18:06 +0000)]
Merge "Replace android auto assets with the latest am:
e45311adc9 am:
a7ad4e2e45" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 17 Aug 2016 18:06:06 +0000 (18:06 +0000)]
Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60"" am:
7f5095ddfe am:
900471ab11" into nyc-mr1-dev-plus-aosp
Andrew Solovay [Wed, 17 Aug 2016 18:05:50 +0000 (18:05 +0000)]
docs: Docs for Support Library 24.2.0 release am:
085994c40d am:
39cc61a4db
am:
4cb3b9a60e
Change-Id: Ifb6f7a2af2d4d1ccaddcaddd6cf8ab17dabc6ee7
Tobias Thierer [Wed, 17 Aug 2016 18:05:06 +0000 (18:05 +0000)]
Merge "Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master am:
6f15eabd29" into nyc-dev-plus-aosp
am:
8fa05abfab
Change-Id: Iafd93f9ebbe74b34359d0d83e0aaca2013d19a4b
Tobias Thierer [Wed, 17 Aug 2016 18:05:02 +0000 (18:05 +0000)]
Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master am:
6f15eabd29
am:
150ab094ed
Change-Id: If378d5a5759462ffef5c45907b7f08328ee696c0
Eric Schmidt [Wed, 17 Aug 2016 18:04:53 +0000 (18:04 +0000)]
Merge "docs: Fixed code snippet in notify-user/navigation.html am:
32cc6b7fb7 am:
c89c8c3e37" into nyc-dev-plus-aosp
am:
d604595820
Change-Id: I99e76a8e1324d963f6ce1cdb907117b848e07190
Eric Schmidt [Wed, 17 Aug 2016 18:04:49 +0000 (18:04 +0000)]
docs: Fixed code snippet in notify-user/navigation.html am:
32cc6b7fb7 am:
c89c8c3e37
am:
97b75e6ce9
Change-Id: Ic036c1e7cb80aab24b7535fb364a49abbcf79e7a
Sriram Viswanathan [Wed, 17 Aug 2016 18:04:36 +0000 (18:04 +0000)]
Merge "Replace android auto assets with the latest" into nyc-mr1-dev am:
91ef993e2d
am:
8f7f6abd09
Change-Id: I53c24a5726bf633474fcba1814bed4ec0ae09217
Tobias Thierer [Wed, 17 Aug 2016 18:04:36 +0000 (18:04 +0000)]
Revert "Revert "Track libcore update of Map classes to jdk8u60"" am:
7f5095ddfe
am:
900471ab11
Change-Id: I14364e0805996c1bfe37e607bd58f35bd51101c8
Sriram Viswanathan [Wed, 17 Aug 2016 18:04:29 +0000 (18:04 +0000)]
Replace android auto assets with the latest am:
e45311adc9
am:
a7ad4e2e45
Change-Id: I8358957ea74d8d815189cf5a843c978fca61c777
John Reck [Wed, 17 Aug 2016 18:04:21 +0000 (18:04 +0000)]
Fix maps resume being blank am:
03df0834e6
am:
08669fff33
Change-Id: If87b076b6c03b7018485ddd4438aeaac7abd1562
Bill Yi [Wed, 17 Aug 2016 18:04:14 +0000 (18:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
60ab8d072a -s ours
am:
d165fa2027 -s ours
Change-Id: Icc61d51603a9806af0849a9aec01a4e58becffb1
Bill Yi [Wed, 17 Aug 2016 18:04:10 +0000 (18:04 +0000)]
Import translations. DO NOT MERGE am:
ad0dfea172 -s ours
am:
217addf432 -s ours
Change-Id: Iac7336e1739740dd752e1e5d71b4ba9618ad5819
OSDN Git Service
