OSDN Git Service
Andreas Gampe [Mon, 19 Sep 2016 22:18:46 +0000 (15:18 -0700)]
OtaDexopt: Fix after-ota space measure
Actually measure the available space.
Bug:
31458900
Change-Id: I16ecee6c275229bc21e908b88b24152484025bc8
Android Build Merger (Role) [Mon, 19 Sep 2016 21:03:52 +0000 (21:03 +0000)]
Merge "Fix deadlock in AcitivityManagerService. am:
67e05b4d28 am:
44c9e2f4bf" into nyc-mr1-dev
Sudheer Shanka [Mon, 19 Sep 2016 21:03:18 +0000 (21:03 +0000)]
Fix deadlock in AcitivityManagerService. am:
67e05b4d28
am:
44c9e2f4bf
Change-Id: I22ce07b7b273cef869ddcebee029c15316ec9c1c
Amith Yamasani [Mon, 19 Sep 2016 21:01:48 +0000 (21:01 +0000)]
Merge "Fix reporting of network connectivity when parole changes" into nyc-mr1-dev
Eric Schmidt [Mon, 19 Sep 2016 20:47:40 +0000 (20:47 +0000)]
Merge "docs: Fixed language directory issue localization" into nyc-dev am:
52fd8f88e1
am:
357b9d9816
Change-Id: I3b72750294d722eba9d6403011c1b43a1e25a5b3
Sudheer Shanka [Mon, 19 Sep 2016 20:45:49 +0000 (20:45 +0000)]
Fix deadlock in AcitivityManagerService.
am:
67e05b4d28
Change-Id: I3dd3a1eb43bb3da17ff13a41c1b847b51f6701d6
Julia Reynolds [Mon, 19 Sep 2016 20:35:32 +0000 (20:35 +0000)]
Merge "Null check action cloning." into nyc-mr1-dev
Eric Schmidt [Mon, 19 Sep 2016 20:03:17 +0000 (20:03 +0000)]
docs: Fixed language directory issue localization am:
8350cbf824
am:
6be384bcf3
Change-Id: I03885d5f89fafb2b2bbb7567a8ee28a4a614ebe3
Eric Schmidt [Mon, 19 Sep 2016 19:51:52 +0000 (19:51 +0000)]
Merge "docs: Fixed language directory issue localization" into nyc-dev
am:
52fd8f88e1
Change-Id: Idc697a15fda5183ad8b9c414f707d601ff3a7e6e
Eric Schmidt [Mon, 19 Sep 2016 19:51:48 +0000 (19:51 +0000)]
docs: Fixed language directory issue localization
am:
8350cbf824
Change-Id: I061d136aeb386b7da9adcd3ff39b5b0c77434289
Eric Schmidt [Mon, 19 Sep 2016 19:47:18 +0000 (19:47 +0000)]
Merge "docs: Fixed language directory issue localization" into nyc-dev
Eino-Ville Talvala [Mon, 19 Sep 2016 19:27:30 +0000 (19:27 +0000)]
Merge "DngCreator: Fix calculation of date/time stamps" into nyc-mr1-dev
Amith Yamasani [Fri, 16 Sep 2016 19:46:31 +0000 (12:46 -0700)]
Fix reporting of network connectivity when parole changes
When parole state changes, compute the uids that have been
impacted by the change of idle state and inform listeners.
Bug:
31399882
Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdleNonMetered_whenCharging
Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdleMetered_whenCharging
Change-Id: I5cc49464a2d359890b5c48033149e569a5b021ca
smain@google.com [Mon, 19 Sep 2016 18:18:44 +0000 (18:18 +0000)]
update DAC landings for Studio 2.2 am:
f032cbfafc
am:
a880476595
Change-Id: Ia5b2326f4a84dae59a17fbb1fd887ce67f0b7eb8
smain@google.com [Mon, 19 Sep 2016 18:12:04 +0000 (18:12 +0000)]
update DAC landings for Studio 2.2
am:
f032cbfafc
Change-Id: Ibd17aeb97c4da57dc2e925c8a113d38b21919456
smain@google.com [Mon, 19 Sep 2016 17:42:34 +0000 (10:42 -0700)]
update DAC landings for Studio 2.2
Change-Id: I5ab5cb935ca058b543bd5751c3cdcc7cbf92a1dd
TreeHugger Robot [Mon, 19 Sep 2016 16:30:16 +0000 (16:30 +0000)]
Merge "Added new config to indicate read-only apn types." into nyc-mr1-dev
Paul Jensen [Mon, 19 Sep 2016 15:28:35 +0000 (15:28 +0000)]
Fix build break due to automerge of
7d2198b5 am:
baae57ab24 am:
009e08116f am:
d6a5f68f52 am:
a81dd677d3 am:
ad004292e1 am:
cc3287ef42 am:
f8d3ded044 am:
8279621b82
am:
57f76df8d7
Change-Id: Id97dd0e8e943144292e426f772997d791b2d5a3f
Paul Jensen [Mon, 19 Sep 2016 15:21:41 +0000 (15:21 +0000)]
Fix build break due to automerge of
7d2198b5 am:
baae57ab24 am:
009e08116f am:
d6a5f68f52 am:
a81dd677d3 am:
ad004292e1 am:
cc3287ef42 am:
f8d3ded044
am:
8279621b82
Change-Id: I42b92758c25af3b56ea7e5150594f43e9ba245e7
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:48:56 +0000 (12:48 +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 am:
410b6d68e2
am:
917584cfa7
Change-Id: I9518f4bbd0ce538a48e1c4a320ec250da04adf35
Paul Jensen [Mon, 19 Sep 2016 12:46:43 +0000 (12:46 +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 am:
c20692329e
am:
38963f7927
Change-Id: Iccce48b0f0cd151ad550f8d4d8b1cdb328c2d1ad
Paul Jensen [Mon, 19 Sep 2016 12:42:28 +0000 (12:42 +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
am:
410b6d68e2
Change-Id: I08f56035a8a4cf2a8c39ef6d59c05111f4eb7185
Paul Jensen [Mon, 19 Sep 2016 12:38:01 +0000 (12:38 +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
am:
c20692329e
Change-Id: I3c580c97c84971f3f188c14fb0e5d93521e17e22
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:37:19 +0000 (00:37 +0000)]
Merge "Revert "Revert "add dev guide for constraint layout.""" into nyc-dev am:
e89de23e0a
am:
d49352abeb
Change-Id: Iafe1cc8a0e8e880b7dcef6fdc4bf77dc9164a0ca
Scott Main [Mon, 19 Sep 2016 00:35:23 +0000 (00:35 +0000)]
Revert "Revert "add dev guide for constraint layout."" am:
02c72bc570
am:
485bc9a5cd
Change-Id: Ie0a04084c2637b5da971955a462729cc019afc7d
Scott Main [Mon, 19 Sep 2016 00:28:50 +0000 (00:28 +0000)]
Merge "Revert "Revert "add dev guide for constraint layout.""" into nyc-dev
am:
e89de23e0a
Change-Id: Icd7dd5f73e42c732df8a95adbb4cfdbe50c38219
Scott Main [Mon, 19 Sep 2016 00:28:47 +0000 (00:28 +0000)]
Revert "Revert "add dev guide for constraint layout.""
am:
02c72bc570
Change-Id: Ie2ea280700f27b0b10d2289dc880c7cc17b0e607
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
Eino-Ville Talvala [Sun, 18 Sep 2016 00:48:04 +0000 (17:48 -0700)]
DngCreator: Fix calculation of date/time stamps
Converting the sensor timestamp to date/time requires checking
what the timebase of those timestamps is; getting it wrong will
create drift that increases with device uptime.
Test: android.hardware.camera2.cts.
DngCreatorTest#testSingleImageThumbnail
Bug:
30125412
Change-Id: Ia5db86012bc9e1c06463b8dc4434d3e063f62cf5
Tadashi G. Takaoka [Sun, 18 Sep 2016 15:09:29 +0000 (15:09 +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 am:
1262ae1aa2
am:
ed9a4cb2e5
Change-Id: I3a137d612a728396cab5b6d9ecc2d4dbe2b08884
Tadashi G. Takaoka [Sun, 18 Sep 2016 14:55:22 +0000 (14:55 +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
am:
1262ae1aa2
Change-Id: I040a343f0fa06aee0c7d6f5df265631c571c3b92
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:38:35 +0000 (14:38 +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 am:
333e229590
am:
2101892b83
Change-Id: Ia11b0bda388cfc7e863e20bc1b8e249669ae6569
Tadashi G. Takaoka [Sun, 18 Sep 2016 14:33:23 +0000 (14:33 +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 am:
2ad63214ab
am:
862aed51df
Change-Id: Id0ec3b0e8c5e2fe9e9ab1fa8861c45836218bb04
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:33:21 +0000 (14:33 +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
am:
333e229590
Change-Id: I7bce6afc9b0080e850b4f9cab6240e5cabd2f822
Tadashi G. Takaoka [Sun, 18 Sep 2016 14:23:08 +0000 (14:23 +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
am:
2ad63214ab
Change-Id: I34e349479add1f082366620c45b981743a48654a
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:22:41 +0000 (14:22 +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 am:
89a4a5310b
am:
a72a8f9293
Change-Id: Ic1ffce00a0e7eb6bace7ceab92a3b469ff7df0e7
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:11:23 +0000 (14:11 +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
am:
89a4a5310b
Change-Id: Iabe55d728f4a191ffc6be9275ac7aea55ba199d7
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:59:57 +0000 (13:59 +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 am:
85f23f9632
am:
cd6a02e924
Change-Id: I7e0a28d1fa42a16c774ec2c718c565e8b344971b
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:39:50 +0000 (13:39 +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 am:
fa7eaf692d
am:
9a932109db
Change-Id: I66730c37bd825961035b8509a48695cbbbda9e92
Tadashi G. Takaoka [Sun, 18 Sep 2016 13:30:43 +0000 (13:30 +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
am:
85f23f9632
Change-Id: Ia5cd90c93ce3f64d20d2fbb37d30f7e6eb10b6d9
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 13:00:52 +0000 (13:00 +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
am:
fa7eaf692d
Change-Id: I6ab49e3482b0877af2f6910efd757540330a688c
Tadashi G. Takaoka [Sun, 18 Sep 2016 13:00:33 +0000 (13:00 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
7bb4c82558 am:
0cf8a60b3f am:
985557ce05 am:
5e3168efe2 -s ours am:
e877c15076
am:
070b965e2a
Change-Id: I67ea2edf975fe4e7d6399432f45957f2e5d9e263
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:50:45 +0000 (12:50 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
7bb4c82558 am:
0cf8a60b3f am:
985557ce05 am:
5e3168efe2 -s ours
am:
e877c15076
Change-Id: I57f8745721914d41c2922efe83799a6fe9878fd6
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