OSDN Git Service
Kevin Hufnagle [Mon, 19 Sep 2016 19:02:33 +0000 (12:02 -0700)]
docs: Added note in LayoutTransition class reference that APPEARING
and DISAPPEARING animation timelines cannot overlap
Bug:
16808571
Change-Id: I8cbac11da4f866f2d3bcde45996b039e9bdfb801
smain@google.com [Mon, 19 Sep 2016 17:42:34 +0000 (10:42 -0700)]
update DAC landings for Studio 2.2
Change-Id: I5ab5cb935ca058b543bd5751c3cdcc7cbf92a1dd
Paul Jensen [Mon, 19 Sep 2016 15:15:52 +0000 (15:15 +0000)]
Fix build break due to automerge of
7d2198b5 am:
baae57ab24 am:
009e08116f am:
d6a5f68f52 am:
a81dd677d3 am:
ad004292e1 am:
cc3287ef42
am:
f8d3ded044
Change-Id: Id7ca0a8a930e3abfd7edd3a5f192ca478de51a34
Paul Jensen [Mon, 19 Sep 2016 15:08:59 +0000 (15:08 +0000)]
Fix build break due to automerge of
7d2198b5 am:
baae57ab24 am:
009e08116f am:
d6a5f68f52 am:
a81dd677d3 am:
ad004292e1
am:
cc3287ef42
Change-Id: Ie67919fe79a9102b7bb5b0dd10f66816fdf03e81
Paul Jensen [Mon, 19 Sep 2016 15:02:28 +0000 (15:02 +0000)]
Fix build break due to automerge of
7d2198b5 am:
baae57ab24 am:
009e08116f am:
d6a5f68f52 am:
a81dd677d3
am:
ad004292e1
Change-Id: I3c5ac16e2a7cad533c7d8c8b0e611bd26743e875
Paul Jensen [Mon, 19 Sep 2016 14:55:54 +0000 (14:55 +0000)]
Fix build break due to automerge of
7d2198b5 am:
baae57ab24 am:
009e08116f am:
d6a5f68f52
am:
a81dd677d3
Change-Id: Id2da47a2300b6fd211da08daddc1873bdc519e14
Paul Jensen [Mon, 19 Sep 2016 14:50:48 +0000 (14:50 +0000)]
Fix build break due to automerge of
7d2198b5 am:
baae57ab24 am:
009e08116f
am:
d6a5f68f52
Change-Id: I55e5c90dd0b2c52a1cbee5d6be14a339157d6a75
Paul Jensen [Mon, 19 Sep 2016 14:43:28 +0000 (14:43 +0000)]
Fix build break due to automerge of
7d2198b5 am:
baae57ab24
am:
009e08116f
Change-Id: Ied1bf21ec09d9774bd0f12d2688244fe7dc2bd80
Paul Jensen [Mon, 19 Sep 2016 14:37:29 +0000 (14:37 +0000)]
Fix build break due to automerge of
7d2198b5
am:
baae57ab24
Change-Id: Iafcc207308b94d37a04d196def0e7c7a5ce037d9
Paul Jensen [Mon, 19 Sep 2016 12:53:20 +0000 (08:53 -0400)]
Fix build break due to automerge of
7d2198b5
Bug:
30100884
Change-Id: I8fa379a74b5d9467b5b9498bd18de2a043963c6f
Paul Jensen [Mon, 19 Sep 2016 12:33:43 +0000 (12:33 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947 am:
3532f10fcb am:
849f1ba2d9 am:
b7ba9fd70f am:
4121b70a7d am:
c875015cc5 am:
66482b555a am:
bedb94754b
am:
a728ecff98
Change-Id: I8c4049d8baa06c1f83e450454f6d98626019b0f5
Paul Jensen [Mon, 19 Sep 2016 12:21:41 +0000 (12:21 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7 am:
66ee2296a9 am:
d37eb76465 am:
ddce8664bd am:
4fd2cc7277 am:
2855de1e7c am:
53a9c65c8d am:
34e77bb699
am:
d3a9c09052
Change-Id: If0af355f2163cae5fd2f76c4458bda8a92149beb
Paul Jensen [Mon, 19 Sep 2016 12:21:39 +0000 (12:21 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947 am:
3532f10fcb am:
849f1ba2d9 am:
b7ba9fd70f am:
4121b70a7d am:
c875015cc5 am:
66482b555a
am:
bedb94754b
Change-Id: I32f3d45fd9c0b1969ca0c566eaed97e006cc7aea
Paul Jensen [Mon, 19 Sep 2016 12:15:21 +0000 (12:15 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7 am:
66ee2296a9 am:
d37eb76465 am:
ddce8664bd am:
4fd2cc7277 am:
2855de1e7c am:
53a9c65c8d
am:
34e77bb699
Change-Id: I205e3c3fe88b28525cd2ec06830dcc9e40b453bb
Paul Jensen [Mon, 19 Sep 2016 12:15:07 +0000 (12:15 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947 am:
3532f10fcb am:
849f1ba2d9 am:
b7ba9fd70f am:
4121b70a7d am:
c875015cc5
am:
66482b555a
Change-Id: I56c9c0235ef6a77764f5d4fc8a77afd7bd34d35b
Paul Jensen [Mon, 19 Sep 2016 12:08:26 +0000 (12:08 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7 am:
66ee2296a9 am:
d37eb76465 am:
ddce8664bd am:
4fd2cc7277 am:
2855de1e7c
am:
53a9c65c8d
Change-Id: Ib5ce70593ec69419bc3ed839ce8cc77b52a32120
Paul Jensen [Mon, 19 Sep 2016 12:08:02 +0000 (12:08 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947 am:
3532f10fcb am:
849f1ba2d9 am:
b7ba9fd70f am:
4121b70a7d
am:
c875015cc5
Change-Id: Ic04dd9fcf708873b95113814eeba18501861a32a
Paul Jensen [Mon, 19 Sep 2016 12:02:09 +0000 (12:02 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7 am:
66ee2296a9 am:
d37eb76465 am:
ddce8664bd am:
4fd2cc7277
am:
2855de1e7c
Change-Id: I67e399dc97073387b2c0c6769bf9b4b19cb91a62
Paul Jensen [Mon, 19 Sep 2016 12:01:57 +0000 (12:01 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947 am:
3532f10fcb am:
849f1ba2d9 am:
b7ba9fd70f
am:
4121b70a7d
Change-Id: I225d23b2ad0afa6113c085d2ee7e51c996896902
Paul Jensen [Mon, 19 Sep 2016 11:55:30 +0000 (11:55 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947 am:
3532f10fcb am:
849f1ba2d9
am:
b7ba9fd70f
Change-Id: If57722c1437bd5ea7b3a1fd016cbc7fce8237965
Paul Jensen [Mon, 19 Sep 2016 11:55:24 +0000 (11:55 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7 am:
66ee2296a9 am:
d37eb76465 am:
ddce8664bd
am:
4fd2cc7277
Change-Id: I2bd78344796e888c4fa26dcf2e07a0a24994cb42
Paul Jensen [Mon, 19 Sep 2016 11:50:42 +0000 (11:50 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7 am:
66ee2296a9 am:
d37eb76465
am:
ddce8664bd
Change-Id: I9379db3398f066841fdb5435d8128e2d12bff63b
Paul Jensen [Mon, 19 Sep 2016 11:50:23 +0000 (11:50 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947 am:
3532f10fcb
am:
849f1ba2d9
Change-Id: I3213d64cc5396a22096e3ad484a3f769f03f6cda
Paul Jensen [Mon, 19 Sep 2016 11:44:22 +0000 (11:44 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7 am:
66ee2296a9
am:
d37eb76465
Change-Id: I2433d723fd9ec13774eff4aa40a089e73932f357
Paul Jensen [Mon, 19 Sep 2016 11:40:02 +0000 (11:40 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947
am:
3532f10fcb
Change-Id: I9dc833de510da32d47c4e6b0a78eae4cc7a38832
Paul Jensen [Mon, 19 Sep 2016 11:37:54 +0000 (11:37 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7
am:
66ee2296a9
Change-Id: Ib0023b44e521b936ab2f9450ad367b1feda64492
Paul Jensen [Mon, 19 Sep 2016 11:34:00 +0000 (11:34 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc
am:
963ca6f947
Change-Id: I1a509c39640e7f9d76bd2e420764aeb3d823a3df
Paul Jensen [Mon, 19 Sep 2016 11:31:54 +0000 (11:31 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273
am:
6634e90ad7
Change-Id: Id46b32b80d47f6b7e2bfab2740978377a6b711cf
Paul Jensen [Mon, 19 Sep 2016 11:27:47 +0000 (11:27 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b
am:
7c08c4d5cc
Change-Id: Idd0a3598ffac808a39703a23238b47a02bca66ed
Paul Jensen [Mon, 19 Sep 2016 11:25:21 +0000 (11:25 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586
am:
9c1cb7a273
Change-Id: I8cd4b0d33da22bc29abd176672659c3eeb8c7d5b
Paul Jensen [Mon, 19 Sep 2016 11:19:16 +0000 (11:19 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev
am:
96c045807b
Change-Id: Ia20ba679f7b0445567b43aa74eef27f751453d4e
Paul Jensen [Mon, 19 Sep 2016 11:19:13 +0000 (11:19 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big
am:
7d2198b586
Change-Id: I512d6f9de6a92dd3cabec93bcadf437f5cf2e16d
Paul Jensen [Mon, 19 Sep 2016 11:10:59 +0000 (11:10 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev
Scott Main [Mon, 19 Sep 2016 00:20:04 +0000 (00:20 +0000)]
Merge "Revert "Revert "add dev guide for constraint layout.""" into nyc-dev
Scott Main [Mon, 19 Sep 2016 00:18:30 +0000 (00:18 +0000)]
Revert "Revert "add dev guide for constraint layout.""
Studio 2.2 launch is back on.
This reverts commit
e6469e821140a44858a4a8a518771992121f9258.
Change-Id: I1fd2bccf2bab302b81fc520ca1d2c34155f6cde7
Tadashi G. Takaoka [Sun, 18 Sep 2016 14:44:36 +0000 (14:44 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1 am:
57454cf15e am:
29f2e1d93a -s ours am:
2578264b86 -s ours am:
94537b171c am:
9bb068a5ad am:
22c8e0b51d -s ours am:
839671d5a9 am:
20a8b9fd96 am:
52dc21f1b5
am:
0d0aed3fc2 -s ours
Change-Id: I88631b5eb5ceb4ec6598a0ddff58daab7a172d13
Tadashi G. Takaoka [Sun, 18 Sep 2016 14:33:22 +0000 (14:33 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1 am:
57454cf15e am:
29f2e1d93a -s ours am:
2578264b86 -s ours am:
94537b171c am:
9bb068a5ad am:
22c8e0b51d -s ours am:
839671d5a9 am:
20a8b9fd96
am:
52dc21f1b5
Change-Id: Ia5613701d6c8c4b25c30053c2a45496a76d0d18a
Tadashi G. Takaoka [Sun, 18 Sep 2016 14:22:41 +0000 (14:22 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1 am:
57454cf15e am:
29f2e1d93a -s ours am:
2578264b86 -s ours am:
94537b171c am:
9bb068a5ad am:
22c8e0b51d -s ours am:
839671d5a9
am:
20a8b9fd96
Change-Id: I4fd4bbbcdb81a1f95f0a647908f60da8b818b78e
Tadashi G. Takaoka [Sun, 18 Sep 2016 14:17:14 +0000 (14:17 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev am:
5fa097311c -s ours am:
233e3b22f9 am:
c296565749 am:
dd583cf069 -s ours am:
2e0a30efd9 am:
7662370f49 am:
e809fe6103
am:
f36da244c2 -s ours
Change-Id: Ic7a4e082949ce207b019217d2c791dcc08dcb3ca
Tadashi G. Takaoka [Sun, 18 Sep 2016 14:12:15 +0000 (14:12 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1 am:
57454cf15e am:
29f2e1d93a -s ours am:
2578264b86 -s ours am:
94537b171c am:
9bb068a5ad am:
22c8e0b51d -s ours
am:
839671d5a9
Change-Id: I04ba40b04c2127a11bc70b1952a452a404275a9e
Tadashi G. Takaoka [Sun, 18 Sep 2016 14:11:39 +0000 (14:11 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
c6fc6c3b55 -s ours am:
076f262197 am:
3b06511a95 am:
61d39b340a -s ours am:
ee518e410b am:
c8334a8844 am:
08871df950
am:
bed85b31f1 -s ours
Change-Id: Ie96d58c0c17059a390e5c83b77fb5a74a43120d5
Tadashi G. Takaoka [Sun, 18 Sep 2016 14:01:49 +0000 (14:01 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev am:
8fa8da727b am:
9ef783599b am:
8310560c62 -s ours am:
a53a42f049 am:
beb643c169 am:
f9952084d4
am:
9f0144c167 -s ours
Change-Id: I1f51ff99ef0b24f0267846261e5f8a85c95fff80
Tadashi G. Takaoka [Sun, 18 Sep 2016 13:51:22 +0000 (13:51 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev am:
5fa097311c -s ours am:
233e3b22f9 am:
c296565749 am:
dd583cf069 -s ours am:
2e0a30efd9 am:
7662370f49
am:
e809fe6103
Change-Id: Ie2b90640e104986d656ae1c575afd8df646c916b
Tadashi G. Takaoka [Sun, 18 Sep 2016 13:43:36 +0000 (13:43 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
c6fc6c3b55 -s ours am:
076f262197 am:
3b06511a95 am:
61d39b340a -s ours am:
ee518e410b am:
c8334a8844
am:
08871df950
Change-Id: I01d1eaf8fb57f45f157bd5a04772917dc600682b
Tadashi G. Takaoka [Sun, 18 Sep 2016 13:41:01 +0000 (13:41 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev am:
5fa097311c -s ours am:
233e3b22f9 am:
c296565749 am:
dd583cf069 -s ours am:
2e0a30efd9
am:
7662370f49
Change-Id: I3613632c10e3f6b8733d77f3bf1f3076342580fa
Tadashi G. Takaoka [Sun, 18 Sep 2016 13:40:52 +0000 (13:40 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1 am:
57454cf15e am:
29f2e1d93a -s ours am:
2578264b86 -s ours am:
94537b171c am:
9bb068a5ad
am:
22c8e0b51d -s ours
Change-Id: I55c117eeaeaaf2801fc19fdc6619a20fc17c13a2
Tadashi G. Takaoka [Sun, 18 Sep 2016 13:40:19 +0000 (13:40 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev am:
8fa8da727b am:
9ef783599b am:
8310560c62 -s ours am:
a53a42f049 am:
beb643c169
am:
f9952084d4
Change-Id: Ic125a89e5ecd3836a4bc1e410048f24256b788cd
Tadashi G. Takaoka [Sun, 18 Sep 2016 13:19:39 +0000 (13:19 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
c6fc6c3b55 -s ours am:
076f262197 am:
3b06511a95 am:
61d39b340a -s ours am:
ee518e410b
am:
c8334a8844
Change-Id: I14aab5eebf96771b0c5f365e4e9e2c3b30db71cb
Tadashi G. Takaoka [Sun, 18 Sep 2016 13:18:57 +0000 (13:18 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1 am:
57454cf15e am:
29f2e1d93a -s ours am:
2578264b86 -s ours am:
94537b171c
am:
9bb068a5ad
Change-Id: I0e4ea875ea14217e98ed5df3642046ce8d3db52a
Tadashi G. Takaoka [Sun, 18 Sep 2016 13:11:28 +0000 (13:11 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
43f4980e77 am:
cd8595cdcf am:
f9dac671ca -s ours am:
9b5fba5f32 am:
d3995603f6 am:
bb84821bad
am:
138cb42dc8 -s ours
Change-Id: I3a4125db695d57eeb18d1e1053af8fd87087df8e
Tadashi G. Takaoka [Sun, 18 Sep 2016 13:03:08 +0000 (13:03 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1 am:
57454cf15e am:
29f2e1d93a -s ours am:
2578264b86 -s ours
am:
94537b171c
Change-Id: I382b954e67faa6ebf662349a763aafe8704ae711
Tadashi G. Takaoka [Sun, 18 Sep 2016 13:01:35 +0000 (13:01 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
43f4980e77 am:
cd8595cdcf am:
f9dac671ca -s ours am:
9b5fba5f32 am:
d3995603f6
am:
bb84821bad
Change-Id: I01429788289d4552ad68c91b32b949933dd48245
Tadashi G. Takaoka [Sun, 18 Sep 2016 13:01:23 +0000 (13:01 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev am:
8fa8da727b am:
9ef783599b am:
8310560c62 -s ours am:
a53a42f049
am:
beb643c169
Change-Id: I2190e307dae81239579b06baa6f271699320d776
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:54:49 +0000 (12:54 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev am:
5fa097311c -s ours am:
233e3b22f9 am:
c296565749 am:
dd583cf069 -s ours
am:
2e0a30efd9
Change-Id: I0fa0e8796310aeec561e4baf33da4fc0145e9c34
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:51:27 +0000 (12:51 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
c6fc6c3b55 -s ours am:
076f262197 am:
3b06511a95 am:
61d39b340a -s ours
am:
ee518e410b
Change-Id: I178dd732ef1b77e4235db277830b2959e8de7831
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:48:56 +0000 (12:48 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev am:
8fa8da727b am:
9ef783599b am:
8310560c62 -s ours
am:
a53a42f049
Change-Id: Id245054a21bd9f029773b5ea2e2663fae836c860
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:48:55 +0000 (12:48 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
43f4980e77 am:
cd8595cdcf am:
f9dac671ca -s ours am:
9b5fba5f32
am:
d3995603f6
Change-Id: I7c0ef7dd8c0032c6d9f2a7c4e17c3b3d1a7cfbb4
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:47:52 +0000 (12:47 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into mnc-dev am:
3a4431bbb9 am:
7e7c15363b am:
aecfb81864
am:
95c8ff2bbc -s ours
Change-Id: I851a16b9bd461c221537b7eaba7c4b51e258dbb1
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:47:22 +0000 (12:47 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1 am:
57454cf15e am:
29f2e1d93a -s ours
am:
2578264b86 -s ours
Change-Id: I0f5483480d7ba6c5a5386635fabc0db0bb5aefdb
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:29:44 +0000 (12:29 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev am:
5fa097311c -s ours am:
233e3b22f9 am:
c296565749
am:
dd583cf069 -s ours
Change-Id: I72554dbf5ccc292baf9a6769c0f52a66cc7d33ee
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:27:27 +0000 (12:27 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
7bb4c82558 am:
0cf8a60b3f am:
985557ce05
am:
5e3168efe2 -s ours
Change-Id: Id00ea6e4418bbe884907a99d761a9979aa364b03
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:27:18 +0000 (12:27 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into mnc-dev am:
3a4431bbb9 am:
7e7c15363b
am:
aecfb81864
Change-Id: I813b9c4879ee86f2dc6e1f3205b8a54f24e913ba
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:27:17 +0000 (12:27 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
43f4980e77 am:
cd8595cdcf am:
f9dac671ca -s ours
am:
9b5fba5f32
Change-Id: Ia9166d55f26c782c9ff1a5b1d2eb25a7d8d4549b
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:27:12 +0000 (12:27 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
c6fc6c3b55 -s ours am:
076f262197 am:
3b06511a95
am:
61d39b340a -s ours
Change-Id: I8a3cba1aaacab87ac5b2ab00c29c7c52f3c8a55c
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:23:36 +0000 (12:23 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev am:
5fa097311c -s ours am:
233e3b22f9
am:
c296565749
Change-Id: I3b97c7b101c53c77f03c889d945d4630edebee44
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:22:55 +0000 (12:22 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1 am:
57454cf15e
am:
29f2e1d93a -s ours
Change-Id: Iaed8d1cc6e6a6bf00a9602ebb829d008f8c4e56e
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:22:44 +0000 (12:22 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
7bb4c82558 am:
0cf8a60b3f
am:
985557ce05
Change-Id: I2069430cc25f652fbf9eb1a45c704cc435b29803
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:21:50 +0000 (12:21 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev am:
8fa8da727b am:
9ef783599b
am:
8310560c62 -s ours
Change-Id: I4091f8ea0cff4720b792d49ee2d5f5cd9c3d3027
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:21:41 +0000 (12:21 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
c6fc6c3b55 -s ours am:
076f262197
am:
3b06511a95
Change-Id: Ia01e63fcf975c21136c0b0206ecd413ec3d975ad
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:18:30 +0000 (12:18 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into mnc-dev am:
3a4431bbb9
am:
7e7c15363b
Change-Id: I337e4998023537ff7ea88e69b1ad2f82614714da
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:17:27 +0000 (12:17 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
43f4980e77 am:
cd8595cdcf
am:
f9dac671ca -s ours
Change-Id: I252b7a8870a3b161a72e1fd7e0dcc7943e6d08ed
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:17:17 +0000 (12:17 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1
am:
57454cf15e
Change-Id: I2620580fca624c6ab4520f0a31c42cef42bafa01
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:17:01 +0000 (12:17 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
7bb4c82558
am:
0cf8a60b3f
Change-Id: I4c019bb037a4d8e0b24f0e627ca59894ed7e38ba
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:12:22 +0000 (12:12 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev am:
8fa8da727b
am:
9ef783599b
Change-Id: Idd8e19b941e01ff2de557c569bb06dc0a7bbb6d1
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:12:15 +0000 (12:12 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev am:
5fa097311c -s ours
am:
233e3b22f9
Change-Id: Iec8b29d93df5e23d80fe9c48f102a6c8d5b4daba
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:10:22 +0000 (12:10 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
43f4980e77
am:
cd8595cdcf
Change-Id: I27939b464cc8e57a7eba7e03af0f4601fb777ec3
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:10:03 +0000 (12:10 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
c6fc6c3b55 -s ours
am:
076f262197
Change-Id: Idcd2180c908fb20bfd861c74e07c45c7b2cffed5
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:04:07 +0000 (12:04 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into mnc-dev
am:
3a4431bbb9
Change-Id: I7a2ef348e1b198f00c750be3653a2e95cc11df22
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:04:06 +0000 (12:04 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev
am:
5fa097311c -s ours
Change-Id: I4c06dd7ff10cafcf15d0e4ece474c97343f608ae
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:04:03 +0000 (12:04 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data
am:
7bb4c82558
Change-Id: I78dae55bf202feafe465875b4ddd85ed4827d74d
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:04:03 +0000 (12:04 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data
am:
c6fc6c3b55 -s ours
Change-Id: I1433140b2805ca127956f210a3faa81f83dd3069
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:04:01 +0000 (12:04 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev
am:
8fa8da727b
Change-Id: Ic46e534eebdba8def4e32318aee04601179fc7a9
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:03:59 +0000 (12:03 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data
am:
f71d2cddf1
Change-Id: Iaa5041d4b5fc61860f7ce95ecce60d39bbd5023b
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:03:58 +0000 (12:03 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data
am:
43f4980e77
Change-Id: Ibbf09fdbcaf00fd41d832e3e2597978e2a0863a9
Tadashi G. Takaoka [Sun, 18 Sep 2016 11:56:23 +0000 (11:56 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into mnc-dev
Tadashi G. Takaoka [Sun, 18 Sep 2016 11:55:55 +0000 (11:55 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev
Tadashi G. Takaoka [Sun, 18 Sep 2016 11:55:33 +0000 (11:55 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev
Jeff Sharkey [Sat, 17 Sep 2016 00:13:26 +0000 (00:13 +0000)]
Merge commit '
0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am:
df42d732f8 am:
afcd1135c3 am:
fc1c0f9dff
am:
33ada2e927
Change-Id: I9b6d2b6f9101e7e7610f191cd4927d568ae0476a
Dirk Dougherty [Fri, 16 Sep 2016 23:44:20 +0000 (23:44 +0000)]
Merge "Add build target for generating navtree json with all inherited members." into nyc-dev
Jeff Sharkey [Fri, 16 Sep 2016 23:40:13 +0000 (23:40 +0000)]
Merge commit '
0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am:
df42d732f8 am:
afcd1135c3
am:
fc1c0f9dff
Change-Id: I4c197be781f981af568ae98e1c3358ce8572e39a
Jeff Sharkey [Fri, 16 Sep 2016 23:31:45 +0000 (23:31 +0000)]
Merge commit '
0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am:
df42d732f8
am:
afcd1135c3
Change-Id: I9cbfddb282796b2425a0da76760bde0ebd8336b4
Jeff Sharkey [Fri, 16 Sep 2016 23:14:51 +0000 (23:14 +0000)]
Merge commit '
0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537
am:
df42d732f8
Change-Id: Ib7efd9dacf476d8a717456d8e6fc7ee617483d17
Jeff Sharkey [Fri, 16 Sep 2016 22:57:34 +0000 (16:57 -0600)]
Merge commit '
0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537
Change-Id: Ib1a0bbb34edb61666ac5739f0b0eaadbe4c5fe06
TreeHugger Robot [Fri, 16 Sep 2016 22:52:39 +0000 (22:52 +0000)]
Merge "docs: Clarification for location permissions and location hardware" into nyc-dev
Jeff Sharkey [Fri, 16 Sep 2016 22:07:27 +0000 (22:07 +0000)]
Use "all_downloads" instead of "my_downloads". am:
1547194418 am:
f6d7c1ed15
am:
6db572cf00
Change-Id: I687a883d528cc260aad3ee3da5600d3e0542c940
Jeff Sharkey [Fri, 16 Sep 2016 21:53:37 +0000 (21:53 +0000)]
Use "all_downloads" instead of "my_downloads". am:
1547194418
am:
f6d7c1ed15
Change-Id: Icb352ec7b0e746264a6311b5fba1fc1272b627b0
Kylie Jue [Fri, 16 Sep 2016 21:51:15 +0000 (21:51 +0000)]
Merge "docs: Added v7 Palette library documentation and images to DAC training. https://android-dot-devsite.googleplex.com/training/material/palette-colors.html" into nyc-dev
Jeff Sharkey [Fri, 16 Sep 2016 21:48:24 +0000 (21:48 +0000)]
Use "all_downloads" instead of "my_downloads".
am:
1547194418
Change-Id: I6dabba1f82ef1989eb2a52c3c493127a174ff315
Joe Fernandez [Fri, 16 Sep 2016 16:51:48 +0000 (09:51 -0700)]
docs: Clarification for location permissions and location hardware
b/
28052540
Change-Id: I54fa08a3339c1d373164a003a02adeed156fa331
Jeff Sharkey [Fri, 16 Sep 2016 18:04:05 +0000 (12:04 -0600)]
Use "all_downloads" instead of "my_downloads".
We can no longer return the "my_downloads" paths: if those Uris were
shared beyond the app that requested the download, access would be
denied. Instead, we need to switch to using "all_downloads" Uris so
that permission grants can be issued to third-party viewer apps.
Since an app requesting a download doesn't normally have permission
to "all_downloads" paths, DownloadProvider now issues narrow grants
toward the owner of each download, both at device boot and when new
downloads are started.
Bug:
30537115,
30945409
Change-Id: I533125b36444877f54373d88922f2acc777e250b
OSDN Git Service
