OSDN Git Service
Chong Zhang [Wed, 17 Aug 2016 23:58:54 +0000 (23:58 +0000)]
Merge "Add new window type TYPE_DRAWN_APPLICATION am:
fea963edee am:
5e09ceb641" into nyc-mr1-dev-plus-aosp
am:
7b8b10bfe9
Change-Id: I728255e5f17d657631b02e8c58bf6bbec9f7f04b
Brad Ebinger [Wed, 17 Aug 2016 23:52:09 +0000 (23:52 +0000)]
Merge "Adds a CNAP filtering field to the CarrierConfig"
Brad Ebinger [Mon, 15 Aug 2016 18:28:26 +0000 (11:28 -0700)]
Adds a CNAP filtering field to the CarrierConfig
Adds the ability for the CarrierConfig to provide a list of CNAP names
that will be filtered out to the user. These names are usually generic
names that do not provide any useful caller ID information, such as
"WIRELESS CALLER".
Bug:
30142293
Change-Id: I8a99975380f99d160c2af6f6fa4b5ca3ebca1d3c
(cherry picked from commit
5ea6b1ece966aacc038d01e004666be81ca3ee8c)
Chong Zhang [Wed, 17 Aug 2016 21:26:57 +0000 (14:26 -0700)]
resolve merge conflicts of
9391bc5 to master
Change-Id: I6de231781233826b399688dc8ead70ba515b1ccb
Phil Weaver [Wed, 17 Aug 2016 21:07:42 +0000 (21:07 +0000)]
Merge "Merge "Add null check to KeyEventDispatcher." into nyc-mr1-dev am:
49b684d562 am:
b126ddb917" into nyc-mr1-dev-plus-aosp
am:
cda1352ed7
Change-Id: Ib8fbfab25589e0de0b301f45b3c98d3ee592866a
Phil Weaver [Wed, 17 Aug 2016 21:07:38 +0000 (21:07 +0000)]
Merge "Add null check to KeyEventDispatcher." into nyc-mr1-dev am:
49b684d562 am:
b126ddb917
am:
9deac03237
Change-Id: I79814ed34edfc0a80651f2412be39dacd243b761
Phil Weaver [Wed, 17 Aug 2016 21:07:30 +0000 (21:07 +0000)]
Merge "Add null check to KeyEventDispatcher. am:
2a0e48aaf5 am:
2aab159e33" into nyc-mr1-dev-plus-aosp
am:
25a6e68c31
Change-Id: I13f9f69f708d34e64782593c2e4846f57e9a33b4
Phil Weaver [Wed, 17 Aug 2016 21:02:29 +0000 (21:02 +0000)]
Add null check to KeyEventDispatcher. am:
2a0e48aaf5 am:
2aab159e33
am:
644f1c2466 -s ours
Change-Id: I7af3e91e34de5a803cb4ccc00f6953ec30d09810
Lei Yu [Wed, 17 Aug 2016 20:42:00 +0000 (20:42 +0000)]
Merge "Fix the data warning be -1 bug when data limit is disabled"
Alexandria Cornwall [Wed, 17 Aug 2016 19:57:11 +0000 (19:57 +0000)]
Merge "AAPT2: Add support to strip namespaces from XML"
TreeHugger Robot [Wed, 17 Aug 2016 18:54:04 +0000 (18:54 +0000)]
Merge "Request a wallpaper update when restoring surface of a wallpaper window"
Selim Cinek [Wed, 17 Aug 2016 18:41:19 +0000 (18:41 +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
am:
816cc359c6
Change-Id: Ia4ef27ae0eb496653a3b515c5cbb10f02b67c63f
Selim Cinek [Wed, 17 Aug 2016 18:41:12 +0000 (18:41 +0000)]
Merge "Fixed a bug where the summary could become visible even if it was suppressed" into nyc-mr1-dev am:
e68228fbd9 am:
225bedbc86
am:
5586bc62aa
Change-Id: If01f5067e8f44e35a7b10bbeebfcebd528d09573
Selim Cinek [Wed, 17 Aug 2016 18:41:02 +0000 (18:41 +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
am:
84acf63a77
Change-Id: I50831cceff062c4568a9adfdb7ba42d4f959fb80
Selim Cinek [Wed, 17 Aug 2016 18:40:59 +0000 (18:40 +0000)]
Fixed a bug where the summary could become visible even if it was suppressed am:
80c44dd800 am:
b665b73437
am:
4a7e6cfe3f
Change-Id: Ic67679ee2070bc8ecce8f74f661d8806b5df9585
Adrian Roos [Wed, 17 Aug 2016 18:40:51 +0000 (18:40 +0000)]
Merge "Merge "NavBar: Use rotation watcher" into nyc-mr1-dev am:
27c3c34fe1 am:
9f36729f4d" into nyc-mr1-dev-plus-aosp
am:
2616b32666
Change-Id: I6061263be749e62c315bf9865e587536b7159fbb
Adrian Roos [Wed, 17 Aug 2016 18:40:47 +0000 (18:40 +0000)]
Merge "NavBar: Use rotation watcher" into nyc-mr1-dev am:
27c3c34fe1 am:
9f36729f4d
am:
decebdad19
Change-Id: I171fab2d76e1822cadc3b217b00fbe4846e95ba6
Adrian Roos [Wed, 17 Aug 2016 18:40:37 +0000 (18:40 +0000)]
Merge "NavBar: Use rotation watcher am:
a98b32cea2 am:
c5d9eb8ebd" into nyc-mr1-dev-plus-aosp
am:
a5b2457dc7
Change-Id: I44ebbfe68ec1e891f4fde2b28fcc7847d25f4940
Adrian Roos [Wed, 17 Aug 2016 18:40:33 +0000 (18:40 +0000)]
NavBar: Use rotation watcher am:
a98b32cea2 am:
c5d9eb8ebd
am:
d966384d80
Change-Id: I103e06685d0f0504db7553c94b07f85fe4909df4
Tyler Gunn [Wed, 17 Aug 2016 18:40:24 +0000 (18:40 +0000)]
Merge changes from topic 'am-
0fee4bce4d374519bf38ae18517a4d79' into nyc-mr1-dev-plus-aosp
am:
b373c6e3b2
Change-Id: Iae074efe94e3a3c2a4767705049e3cab6b4724f0
Tyler Gunn [Wed, 17 Aug 2016 18:40:20 +0000 (18:40 +0000)]
Merge "Support auto-downgrade to audio when data disabled." into nyc-mr1-dev am:
76c973cda0 am:
464eb12320
am:
9b4da39028
Change-Id: Ib89b1893125b9378367baf06dd10ee4c92b7392e
Tyler Gunn [Wed, 17 Aug 2016 18:39:26 +0000 (18:39 +0000)]
Support auto-downgrade to audio when data disabled. am:
86d5c3fcde am:
6c678716e4
am:
f37124b2f5
Change-Id: Ia58c68ad7d25abe3104609ae30e02fd0f6b1fc7a
Eric Schmidt [Wed, 17 Aug 2016 18:39:12 +0000 (18:39 +0000)]
docs: Fixed code snippet in notify-user/navigation.html am:
32cc6b7fb7 am:
39cc61a4db am:
2367fb1c56
am:
b9709340bc
Change-Id: If26a14a6f4982a1c2abe9de6296b222e121839b6
Tobias Thierer [Wed, 17 Aug 2016 18:39:05 +0000 (18:39 +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
am:
4e11151428
Change-Id: I4a60191803cbf983aee485dd64239e9be7eefd23
Tobias Thierer [Wed, 17 Aug 2016 18:38:56 +0000 (18:38 +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
am:
1bdb989749
Change-Id: Idaf854c4ab3a213af17886e2534b10c38d1cef0f
Tobias Thierer [Wed, 17 Aug 2016 18:38:30 +0000 (18:38 +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
am:
c208ec636c
Change-Id: Ie124f78d6422d1408a4adcc519caa92bd4a251a6
Tobias Thierer [Wed, 17 Aug 2016 18:38:19 +0000 (18:38 +0000)]
Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master am:
6f15eabd29 am:
150ab094ed
am:
8c35ae8afb
Change-Id: I2d1c8a229ae7179f3ac28048349c0f89d129c46c
Eric Schmidt [Wed, 17 Aug 2016 18:38:00 +0000 (18:38 +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
am:
6bb6c339f8
Change-Id: I963823732dac67d72a1db8dc0cb34d17d765d44f
Eric Schmidt [Wed, 17 Aug 2016 18:37:55 +0000 (18:37 +0000)]
Merge "docs: Fixed code snippet in notify-user/navigation.html am:
32cc6b7fb7 am:
c89c8c3e37" into nyc-dev-plus-aosp am:
d604595820
am:
a4656cba09
Change-Id: I110fc75714569f3ae548824f0f4f6ae6bda90718
Sriram Viswanathan [Wed, 17 Aug 2016 18:30:33 +0000 (18:30 +0000)]
Merge "Merge "Replace android auto assets with the latest" into nyc-mr1-dev am:
91ef993e2d am:
8f7f6abd09" into nyc-mr1-dev-plus-aosp
am:
deee4c8b2d
Change-Id: I207915ddd212dedc1f043dd6ff2d5227452f23b8
Sriram Viswanathan [Wed, 17 Aug 2016 18:30:30 +0000 (18:30 +0000)]
Merge "Replace android auto assets with the latest" into nyc-mr1-dev am:
91ef993e2d am:
8f7f6abd09
am:
f8b555dbf0
Change-Id: I2fa87b4ec558fb44e07dac4d8e2a526dd4cf1b06
Eric Schmidt [Wed, 17 Aug 2016 18:30:22 +0000 (18:30 +0000)]
Merge "docs: Fixed code snippet in notify-user/navigation.html am:
32cc6b7fb7 am:
c89c8c3e37 am:
97b75e6ce9" into nyc-mr1-dev-plus-aosp
am:
84e360c86c
Change-Id: Ifb3161e96d64454d21981f9b1ba6a80b53560d44
Eric Schmidt [Wed, 17 Aug 2016 18:30:18 +0000 (18:30 +0000)]
docs: Fixed code snippet in notify-user/navigation.html am:
32cc6b7fb7 am:
c89c8c3e37 am:
97b75e6ce9
am:
e9bcfaf42b
Change-Id: I671f067dd0fccba03cf499f55943f945c063393c
Sriram Viswanathan [Wed, 17 Aug 2016 18:30:04 +0000 (18:30 +0000)]
Merge "Replace android auto assets with the latest am:
e45311adc9 am:
a7ad4e2e45" into nyc-mr1-dev-plus-aosp
am:
caed0244a8
Change-Id: I9010c0331a4df190bde6010dcaea2fb5270fc6d8
Sriram Viswanathan [Wed, 17 Aug 2016 18:29:59 +0000 (18:29 +0000)]
Replace android auto assets with the latest am:
e45311adc9 am:
a7ad4e2e45
am:
f90598df12
Change-Id: Ib2a2910f059cb8568fcb97349c102a3e4aaba33c
Tobias Thierer [Wed, 17 Aug 2016 18:29:25 +0000 (18:29 +0000)]
Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60"" am:
7f5095ddfe am:
900471ab11" into nyc-mr1-dev-plus-aosp
am:
95d9a69a60
Change-Id: I4f9af560995c9a21d7a69fdcd324e3e98b0ef135
Tobias Thierer [Wed, 17 Aug 2016 18:29:15 +0000 (18:29 +0000)]
Revert "Revert "Track libcore update of Map classes to jdk8u60"" am:
7f5095ddfe am:
900471ab11
am:
75cff53a34
Change-Id: I81f68f93a7c5f96f1c5db1bf2bc259c09fdbf306
John Reck [Wed, 17 Aug 2016 18:28:51 +0000 (18:28 +0000)]
Fix maps resume being blank am:
03df0834e6 am:
08669fff33
am:
28f4ee5f7b
Change-Id: I5d6ea69cb13a43401a6cdc7039eafc1186a2fa85
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: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
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
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
Bill Yi [Wed, 17 Aug 2016 18:18:20 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
60ab8d072a -s ours am:
d165fa2027 -s ours
am:
070628ce11 -s ours
Change-Id: I75fa9a56de6866ebbd36e784e73dadcb36fed1f3
Bill Yi [Wed, 17 Aug 2016 18:18:16 +0000 (18:18 +0000)]
Import translations. DO NOT MERGE am:
ad0dfea172 -s ours am:
217addf432 -s ours
am:
54b1a3bbbb -s ours
Change-Id: Ibd1e0ab7c734be375d640bfab02c69517776a875
Bill Yi [Wed, 17 Aug 2016 18:18:13 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
48d01fde6b -s ours am:
c182b0067e -s ours
am:
84e0668db3 -s ours
Change-Id: Ib4e821c805b07cb108754d909600fd4861158a26
Bill Yi [Wed, 17 Aug 2016 18:18:06 +0000 (18:18 +0000)]
Import translations. DO NOT MERGE am:
28753c7c4a -s ours am:
5b0b9696bb -s ours
am:
c156d80985 -s ours
Change-Id: I720d9d8c3eca07e2fd2c88c2b9ca14b79c03b926
Michael Kwan [Wed, 17 Aug 2016 18:18:01 +0000 (18:18 +0000)]
Merge "Hide space for title if the title is GONE." into cw-f-dev am:
dc0735676b
am:
1323d6158b
Change-Id: Id06809154dc9d09b46214aae4779f65770736103
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
Michael Kwan [Wed, 17 Aug 2016 18:07:34 +0000 (18:07 +0000)]
Hide space for title if the title is GONE. am:
790a34e1a9
am:
9019052e96
Change-Id: I533e56cc90316ed23c3a0499c30b48d4a3993ad5
Bill Yi [Wed, 17 Aug 2016 18:07:26 +0000 (18:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
ab2c244135 -s ours
am:
46bf9f50e9 -s ours
Change-Id: Ic8067af1a2b2a5f03cf2db8cbbc5feb48e1a2161
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
Bill Yi [Wed, 17 Aug 2016 18:07:21 +0000 (18:07 +0000)]
Import translations. DO NOT MERGE am:
722903594e -s ours
am:
b2c184c40f -s ours
Change-Id: Iaac01e1185dfbc8abf2d5243b025c5eb8c7bd82a
Bill Yi [Wed, 17 Aug 2016 18:07:16 +0000 (18:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
4bdc6b6c9f -s ours
am:
9623ec0214 -s ours
Change-Id: I42d99c8a686357480967039a75105dae6c1b4bba
Bill Yi [Wed, 17 Aug 2016 18:07:11 +0000 (18:07 +0000)]
Import translations. DO NOT MERGE am:
03fa77f054 -s ours
am:
829c18e810 -s ours
Change-Id: Ie0b624e9dab3bdd3c42136cfd1361f460d2f3d3c
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
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
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
Alexandria Cornwall [Tue, 16 Aug 2016 20:33:32 +0000 (13:33 -0700)]
AAPT2: Add support to strip namespaces from XML
The --no-xml-namespaces flag will strip namespace information from
compiled binary XML files in res/* (excluding res/raw/*) and
AndroidManifest.xml. It will also strip URI information from compiled
binary XML files in res/* (excluding res/raw/* and AndroidManifest.xml).
AndroidManifest.xml URI information is retained due to PackageParser, which
requires the Android URI for intent filters.
Bug:
29115919
Change-Id: I90cad6ed39ce02a69776f55314c1d4f38ad1aabe
Android Build Merger (Role) [Wed, 17 Aug 2016 17:54:57 +0000 (17:54 +0000)]
Merge "Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master am:
6f15eabd29" into nyc-dev-plus-aosp
Android Build Merger (Role) [Wed, 17 Aug 2016 17:54:51 +0000 (17:54 +0000)]
Merge "docs: Fixed code snippet in notify-user/navigation.html am:
32cc6b7fb7 am:
c89c8c3e37" into nyc-dev-plus-aosp
Eric Schmidt [Wed, 17 Aug 2016 17:54:21 +0000 (17:54 +0000)]
docs: Fixed code snippet in notify-user/navigation.html am:
32cc6b7fb7
am:
c89c8c3e37
Change-Id: I0193239ada03ca2e5bc5ab856f778f69a691b325
Tobias Thierer [Wed, 17 Aug 2016 17:54:12 +0000 (17:54 +0000)]
Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master
am:
6f15eabd29
Change-Id: Ic1c3c789ffdc7b9d1f59faea6292c8f3489e8ad4
Tobias Thierer [Wed, 17 Aug 2016 17:54:08 +0000 (17:54 +0000)]
Revert "Revert "Track libcore update of Map classes to jdk8u60""
am:
7f5095ddfe
Change-Id: I815b5c9b5620fb1fc9f18dd6b0bb0d185c114410
Erik Kline [Wed, 17 Aug 2016 17:51:52 +0000 (17:51 +0000)]
Support timeouts for requestNetwork() invocations. [DO NOT MERGE]
am:
06c3ef1367 -s ours
Change-Id: Ia98ec84e1c9e691c58ebb79f516b62b229dda5fe
Andrew Solovay [Wed, 17 Aug 2016 17:48:47 +0000 (17:48 +0000)]
docs: Docs for Support Library 24.2.0 release
am:
085994c40d
Change-Id: I7e69bf585d342f1075856673e52ff15207be4a1c
Bill Yi [Wed, 17 Aug 2016 17:48:43 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
48d01fde6b -s ours
am:
c182b0067e -s ours
Change-Id: I244e2f5ccc90487e825f94b241b613138a008139
Bill Yi [Wed, 17 Aug 2016 17:48:39 +0000 (17:48 +0000)]
Import translations. DO NOT MERGE am:
28753c7c4a -s ours
am:
5b0b9696bb -s ours
Change-Id: I0a9c90c2cc4e9fbea518a27fb0a0fe75b095689e
Michael Kwan [Wed, 17 Aug 2016 17:48:36 +0000 (17:48 +0000)]
Merge "Hide space for title if the title is GONE." into cw-f-dev
am:
dc0735676b
Change-Id: Ie66f71281c6cea959fe5ddb44dbc815854d0c3f0
Michael Kwan [Wed, 17 Aug 2016 17:48:32 +0000 (17:48 +0000)]
Hide space for title if the title is GONE.
am:
790a34e1a9
Change-Id: I515514013819133228f3185166fe7962ab2f27c8
Bill Yi [Wed, 17 Aug 2016 17:48:27 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
ab2c244135 -s ours
Change-Id: I0f157e5edbbd3e85ee32dda3ed379f72e854bbd7
Bill Yi [Wed, 17 Aug 2016 17:48:23 +0000 (17:48 +0000)]
Import translations. DO NOT MERGE
am:
722903594e -s ours
Change-Id: I250c39b7fb65641fcb2ea1f593511a76cc2da24a
Bill Yi [Wed, 17 Aug 2016 17:48:18 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
4bdc6b6c9f -s ours
Change-Id: If6ff278b09f1162111aee9ec2281bcfc156c7c11
Bill Yi [Wed, 17 Aug 2016 17:48:15 +0000 (17:48 +0000)]
Import translations. DO NOT MERGE
am:
03fa77f054 -s ours
Change-Id: I3434d54d4ba5673ba174c76dd8ddf5a52afcf31b
OSDN Git Service
