OSDN Git Service
Android Build Merger (Role) [Tue, 13 Jun 2017 10:52:24 +0000 (10:52 +0000)]
Merge "Merge "Eagerly serialize historical sessions" into oc-dev am:
c7ea7effde am:
7ba9c4dc62" into oc-dr1-dev-plus-aosp
Narayan Kamath [Tue, 13 Jun 2017 10:50:44 +0000 (10:50 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev am:
c7ea7effde
am:
17652d85ec
Change-Id: Ieb233fb57cddf68e282779ce0eb193abd1300de6
Narayan Kamath [Tue, 13 Jun 2017 10:50:43 +0000 (10:50 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev am:
c7ea7effde
am:
7ba9c4dc62
Change-Id: I57639e4d18b04adf94d4da235cce5e957e88641e
Narayan Kamath [Tue, 13 Jun 2017 10:40:48 +0000 (10:40 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev
am:
c7ea7effde
Change-Id: Ice68d0de34795a23d9d7364244d564bc48a7d436
Narayan Kamath [Tue, 13 Jun 2017 10:40:46 +0000 (10:40 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev
am:
c7ea7effde
Change-Id: Iff55674bc989986e14d0bcea3c71bad5751d4dcb
Narayan Kamath [Tue, 13 Jun 2017 10:32:22 +0000 (10:32 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev
Narayan Kamath [Mon, 12 Jun 2017 12:34:29 +0000 (13:34 +0100)]
Eagerly serialize historical sessions
mHistoricalSessions maintained a strong reference to a PackageInstallerSession,
which in turn kept references to Bitmaps and other heavy-weight objects around.
Since this field is primarily used for debugging, this change replaces it with
a String dump of the session in question. Each dump takes about 600bytes, which
is comparable to the sizes of the un-serialized raw objects.
Bug:
62485552
Test: Manual
Change-Id: I4949a64b538ab4a97384f4f8bc9a6ef155a4b128
Erik Kline [Tue, 13 Jun 2017 08:42:44 +0000 (08:42 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" am:
30a1cf96bb am:
cfaeabb3e3
am:
4bcce2b2ef
Change-Id: Ifeb49f1b19ab36e438763b569c78a335b094f7d0
Erik Kline [Tue, 13 Jun 2017 08:36:14 +0000 (08:36 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" am:
30a1cf96bb
am:
cfaeabb3e3
Change-Id: Idfebb9b79074f21aeccf773cac98aa7839bda9da
Erik Kline [Tue, 13 Jun 2017 08:29:06 +0000 (08:29 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information"
am:
30a1cf96bb
Change-Id: I0f7234363f94694ecc4e97d87c7ffb6bb244895d
Erik Kline [Tue, 13 Jun 2017 08:20:40 +0000 (08:20 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information"
Adam Vartanian [Tue, 13 Jun 2017 08:19:16 +0000 (08:19 +0000)]
Merge "DO NOT MERGE Remove createSocket(Socket, InputStream, boolean) from APIs." into oc-dr1-dev
am:
87587fbda2
Change-Id: I669d80114ed83231205da0a608ee8e7cdfa8956c
Adam Vartanian [Tue, 13 Jun 2017 08:13:28 +0000 (08:13 +0000)]
Merge "DO NOT MERGE Remove createSocket(Socket, InputStream, boolean) from APIs." into oc-dr1-dev
Erik Kline [Tue, 13 Jun 2017 03:41:18 +0000 (03:41 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available" am:
6428e1a4d4 am:
e675273dbc
am:
e13b93c585
Change-Id: Iac19359fd8712fa6a135f31bed9f0da97b3f2977
Erik Kline [Tue, 13 Jun 2017 03:34:55 +0000 (03:34 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available" am:
6428e1a4d4
am:
e675273dbc
Change-Id: I99b170ebacc4135d1a09ce1ec3d43f76c6765de4
Erik Kline [Tue, 13 Jun 2017 03:25:12 +0000 (03:25 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available"
am:
6428e1a4d4
Change-Id: I51f2e1864f5aaf1369e980f44537ab4f4a0e703e
Treehugger Robot [Tue, 13 Jun 2017 03:13:18 +0000 (03:13 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available"
Erik Kline [Fri, 9 Jun 2017 08:08:52 +0000 (17:08 +0900)]
make UpsreamNetworkMonitor the sole source of upstream network information
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: I66ce682cf9c31887264a095a4e4638d281d8ed39
Android Build Merger (Role) [Tue, 13 Jun 2017 02:41:43 +0000 (02:41 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7fc501184a -s ours" into oc-dr1-dev am:
2eb4ec0e72 -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Jun 2017 02:41:01 +0000 (02:41 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7fc501184a -s ours am:
15094560a4 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 13 Jun 2017 02:40:48 +0000 (02:40 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7fc501184a -s ours" into oc-dr1-dev
am:
2eb4ec0e72 -s ours
Change-Id: I2447e12325c6ef7d6152c17c1b7a6236b0aae313
Bill Yi [Tue, 13 Jun 2017 02:38:30 +0000 (02:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7fc501184a -s ours
am:
15094560a4 -s ours
Change-Id: I515e92a539513b308fc79ae7127d074819bc3a73
Bill Yi [Tue, 13 Jun 2017 02:38:29 +0000 (02:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
34cfd78f8e -s ours
Change-Id: Iccdd50aca254ad54a1c34ec3dd1d37d494f04f7f
Android Build Merger (Role) [Tue, 13 Jun 2017 02:32:13 +0000 (02:32 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7fc501184a -s ours" into oc-dr1-dev
Bill Yi [Tue, 13 Jun 2017 02:31:28 +0000 (02:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7fc501184a -s ours
Change-Id: I62669a422c38856f0d164a149f6415e59e2b81d4
TreeHugger Robot [Tue, 13 Jun 2017 02:31:23 +0000 (02:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 13 Jun 2017 02:30:19 +0000 (02:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7fc501184a -s ours
Change-Id: I418c08d5f5bf997d7e870bafc2a0b68f519dd990
Bill Yi [Tue, 13 Jun 2017 02:30:08 +0000 (02:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
1190614529 -s ours
Change-Id: Ide4638e5f3a11cc9457cf9ddbf61ecf748967491
Erik Kline [Fri, 9 Jun 2017 07:36:29 +0000 (16:36 +0900)]
Only disable Wi-Fi IP serving on specific interface, if available
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: Ifd9131bad20810ee24c9436d8c0df7a81fae11d5
TreeHugger Robot [Tue, 13 Jun 2017 02:20:34 +0000 (02:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 13 Jun 2017 02:18:42 +0000 (02:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Winson Chung [Tue, 13 Jun 2017 01:51:00 +0000 (01:51 +0000)]
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev am:
b1cdc17dfb
am:
87997ce838
Change-Id: Ib22c951e0e17c90a13b9b4e5697eb5127a1011ba
Android Build Merger (Role) [Tue, 13 Jun 2017 01:48:14 +0000 (01:48 +0000)]
Merge "Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev am:
43dc06a9a9" into oc-dr1-dev-plus-aosp
Etan Cohen [Tue, 13 Jun 2017 01:46:09 +0000 (01:46 +0000)]
Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev
am:
43dc06a9a9
Change-Id: I5d163be24053eba0592dddf637fdd89373c8fa15
Winson Chung [Tue, 13 Jun 2017 01:45:31 +0000 (01:45 +0000)]
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev am:
b1cdc17dfb
am:
ebc74796e4
Change-Id: Id4818ff5e203cb2aa40079ed7af24c4b84a957ba
Winson Chung [Tue, 13 Jun 2017 01:41:18 +0000 (01:41 +0000)]
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev
am:
b1cdc17dfb
Change-Id: I987d923b923e289baa76d5155cf6a7fe4d9ece6a
Winson Chung [Tue, 13 Jun 2017 01:37:34 +0000 (01:37 +0000)]
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev
am:
b1cdc17dfb
Change-Id: I54fcc6a340e24beae112fcd5753a1b60bb586c24
TreeHugger Robot [Tue, 13 Jun 2017 01:34:43 +0000 (01:34 +0000)]
Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev
Android Build Merger (Role) [Tue, 13 Jun 2017 01:19:42 +0000 (01:19 +0000)]
Merge "Merge "Protect broadcast used in settings for bond cancel" into oc-dev am:
68a4c91bb4 am:
2ddb92f2d9" into oc-dr1-dev-plus-aosp
Marie Janssen [Tue, 13 Jun 2017 01:18:53 +0000 (01:18 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev am:
68a4c91bb4
am:
2ddb92f2d9
Change-Id: Iede1ea0f5f9409538295b3861e2343647ba51026
TreeHugger Robot [Tue, 13 Jun 2017 01:18:45 +0000 (01:18 +0000)]
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev
Android Build Merger (Role) [Tue, 13 Jun 2017 01:18:26 +0000 (01:18 +0000)]
Merge "Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am:
e1e0db8ca9 am:
5323b2d4cd" into oc-dr1-dev-plus-aosp
Wale Ogunwale [Tue, 13 Jun 2017 01:17:33 +0000 (01:17 +0000)]
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am:
e1e0db8ca9
am:
5323b2d4cd
Change-Id: I659c818c815b46d666986b1a1224fd4d4f57e56e
Android Build Merger (Role) [Tue, 13 Jun 2017 01:17:15 +0000 (01:17 +0000)]
Merge "Merge "Protect broadcast used in settings for bond cancel" into oc-dev am:
68a4c91bb4 am:
4c342c8a98" into oc-dr1-dev-plus-aosp
Tianjie Xu [Tue, 13 Jun 2017 01:14:58 +0000 (01:14 +0000)]
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am:
f40f297546
am:
c7fed42403
Change-Id: I196fe22ce901383f3349b99823f066d1226fa4fb
Marie Janssen [Tue, 13 Jun 2017 01:14:33 +0000 (01:14 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev am:
68a4c91bb4
am:
4c342c8a98
Change-Id: Ia608d4af6afda14097a94013bf2dbe64962ebd74
Android Build Merger (Role) [Tue, 13 Jun 2017 01:10:52 +0000 (01:10 +0000)]
Merge "Merge "Address IMSI privacy issues." am:
ef6b81e5b2 am:
91a4d3df01 am:
3f095ca368" into oc-dr1-dev-plus-aosp
Pankaj Kanwar [Tue, 13 Jun 2017 01:09:44 +0000 (01:09 +0000)]
Merge "Address IMSI privacy issues." am:
ef6b81e5b2 am:
91a4d3df01
am:
3f095ca368
Change-Id: I3f9a2f48e8b45b7625c364983b2b3d342e70d5d0
Android Build Merger (Role) [Tue, 13 Jun 2017 01:09:16 +0000 (01:09 +0000)]
Merge "Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am:
e1e0db8ca9 am:
90159a2492" into oc-dr1-dev-plus-aosp
Wale Ogunwale [Tue, 13 Jun 2017 01:08:25 +0000 (01:08 +0000)]
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am:
e1e0db8ca9
am:
90159a2492
Change-Id: I0092411f5b8bef853b55e6ffe7bdf700876f7715
Robert Carr [Tue, 13 Jun 2017 01:06:32 +0000 (01:06 +0000)]
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am:
42b3610adc
am:
aec6b4749a
Change-Id: Ic8bbda9b2fc76253c70e9f5cd15d6a32b212b50d
Marie Janssen [Tue, 13 Jun 2017 01:04:55 +0000 (01:04 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev
am:
68a4c91bb4
Change-Id: Ifdb4b625f21dcda5248071263aaf6936158efb39
Wale Ogunwale [Tue, 13 Jun 2017 01:01:51 +0000 (01:01 +0000)]
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev
am:
e1e0db8ca9
Change-Id: I2d854e36c31a8fa1cf74e5c5a536969ee94dc79b
Tianjie Xu [Tue, 13 Jun 2017 00:58:53 +0000 (00:58 +0000)]
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
am:
f40f297546
Change-Id: Id60cf7cf4b82f17fd094fa011bb54a543e636f48
Jorim Jaggi [Tue, 13 Jun 2017 00:54:18 +0000 (00:54 +0000)]
Merge "Attempted fix for navigation bar flicker" into oc-dev am:
bbd7dfc0a4
am:
20eb74681f
Change-Id: I9dc34fe898c8ce9f5c1babfa73bf619c0e69a494
Robert Carr [Tue, 13 Jun 2017 00:54:10 +0000 (00:54 +0000)]
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
am:
42b3610adc
Change-Id: I3238399a26917f80bd4e33bb20142f62076e6f4f
Marie Janssen [Tue, 13 Jun 2017 00:51:09 +0000 (00:51 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev
am:
68a4c91bb4
Change-Id: I3dc46eca98c859c540d528cb8a4a409587a25383
Android Build Merger (Role) [Tue, 13 Jun 2017 00:49:12 +0000 (00:49 +0000)]
Merge "Merge "Improve developer docs for storage APIs." into oc-dev am:
05b52d8ba5 am:
0ba24ed694" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Tue, 13 Jun 2017 00:48:06 +0000 (00:48 +0000)]
Merge "Improve developer docs for storage APIs." into oc-dev am:
05b52d8ba5
am:
0ba24ed694
Change-Id: I8a33e050caba8a7f80b64709174a867a50857571
Android Build Merger (Role) [Tue, 13 Jun 2017 00:47:37 +0000 (00:47 +0000)]
Merge "Merge "Don't log all instant app resolutions" into oc-dev am:
3ef0b8260f am:
f734de79cc" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Jun 2017 00:47:18 +0000 (00:47 +0000)]
Merge "Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am:
f40f297546 am:
d04d501ce7" into oc-dr1-dev-plus-aosp
Todd Kennedy [Tue, 13 Jun 2017 00:46:50 +0000 (00:46 +0000)]
Merge "Don't log all instant app resolutions" into oc-dev am:
3ef0b8260f
am:
f734de79cc
Change-Id: Ie507e44ad423296de9ab545c1afcd881273b30e1
Android Build Merger (Role) [Tue, 13 Jun 2017 00:46:20 +0000 (00:46 +0000)]
Merge "Merge changes from topic 'sysui-tooltip' into oc-dev am:
3fbcec5b86 am:
bc168cf9d5" into oc-dr1-dev-plus-aosp
Tianjie Xu [Tue, 13 Jun 2017 00:46:27 +0000 (00:46 +0000)]
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am:
f40f297546
am:
d04d501ce7
Change-Id: Ide407c6ccc5a42c9a57acb1652b19db99bee42a8
Android Build Merger (Role) [Tue, 13 Jun 2017 00:45:55 +0000 (00:45 +0000)]
Merge "Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am:
42b3610adc am:
2fa5800da9" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Tue, 13 Jun 2017 00:45:40 +0000 (00:45 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev
Vladislav Kaznacheev [Tue, 13 Jun 2017 00:45:32 +0000 (00:45 +0000)]
Merge changes from topic 'sysui-tooltip' into oc-dev am:
3fbcec5b86
am:
bc168cf9d5
Change-Id: I5b2320564692df6fa14bfeb49fcf350fc4cb2d9d
Pankaj Kanwar [Tue, 13 Jun 2017 00:45:04 +0000 (00:45 +0000)]
Merge "Address IMSI privacy issues." am:
ef6b81e5b2
am:
91a4d3df01
Change-Id: I15e60cbbff06d7f66e86d755ae87b2e3513ca4a9
Robert Carr [Tue, 13 Jun 2017 00:43:56 +0000 (00:43 +0000)]
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am:
42b3610adc
am:
2fa5800da9
Change-Id: I83c4a2e592b7385b1aa6dc3157bd6ea5950c624a
Bill Yi [Tue, 13 Jun 2017 00:43:00 +0000 (00:43 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c2a12b658 -s ours
am:
5a3998fe38 -s ours
Change-Id: Ic55a5b3c7cc13af454abc3fbb4f1dba7be64d107
Jorim Jaggi [Tue, 13 Jun 2017 00:41:40 +0000 (00:41 +0000)]
Merge "Attempted fix for navigation bar flicker" into oc-dev
am:
bbd7dfc0a4
Change-Id: I80a618eb59f0479060a69ca4f0be8ac883a8d48d
Android Build Merger (Role) [Tue, 13 Jun 2017 00:39:21 +0000 (00:39 +0000)]
Merge "Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am:
71029bf631 am:
938fe5c968" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 13 Jun 2017 00:39:07 +0000 (00:39 +0000)]
Merge "Merge "Attempted fix for navigation bar flicker" into oc-dev am:
bbd7dfc0a4 am:
78c9744f41" into oc-dr1-dev-plus-aosp
Will Brazil [Tue, 13 Jun 2017 00:38:29 +0000 (00:38 +0000)]
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am:
71029bf631
am:
938fe5c968
Change-Id: I147dea17afffba890b5bb3108d061bdf4f7c76f7
Jorim Jaggi [Tue, 13 Jun 2017 00:38:04 +0000 (00:38 +0000)]
Merge "Attempted fix for navigation bar flicker" into oc-dev am:
bbd7dfc0a4
am:
78c9744f41
Change-Id: I985f319bb1cf6627abef2a7dafd9fafd64309264
Android Build Merger (Role) [Tue, 13 Jun 2017 00:37:39 +0000 (00:37 +0000)]
Merge "Merge "Protect broadcast used in settings for bond cancel" am:
5cfbbce162 am:
00bce50dc3 am:
297dbb86fe" into oc-dr1-dev-plus-aosp
Pankaj Kanwar [Tue, 13 Jun 2017 00:37:13 +0000 (00:37 +0000)]
Merge "Address IMSI privacy issues."
am:
ef6b81e5b2
Change-Id: I41c06fc9bf9012f93e10b59c49d5a7314331ea5f
Marie Janssen [Tue, 13 Jun 2017 00:36:46 +0000 (00:36 +0000)]
Merge "Protect broadcast used in settings for bond cancel" am:
5cfbbce162 am:
00bce50dc3
am:
297dbb86fe
Change-Id: I630bc69705870d4cd7252da9bc8501c564950393
Android Build Merger (Role) [Tue, 13 Jun 2017 00:36:12 +0000 (00:36 +0000)]
Merge "Merge "Improve developer docs for storage APIs." into oc-dev am:
05b52d8ba5 am:
f96c9a0fa2" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Tue, 13 Jun 2017 00:36:09 +0000 (00:36 +0000)]
Merge "Improve developer docs for storage APIs." into oc-dev
am:
05b52d8ba5
Change-Id: I282786d353e3dc406c7123daa00d3e7fe43de7bc
Jeff Sharkey [Tue, 13 Jun 2017 00:35:13 +0000 (00:35 +0000)]
Merge "Improve developer docs for storage APIs." into oc-dev am:
05b52d8ba5
am:
f96c9a0fa2
Change-Id: Ifef4156412f88e1d7bc3d8bbccaca6d0177c7245
Android Build Merger (Role) [Tue, 13 Jun 2017 00:34:43 +0000 (00:34 +0000)]
Merge "Merge "Don't log all instant app resolutions" into oc-dev am:
3ef0b8260f am:
5ca9d413f8" into oc-dr1-dev-plus-aosp
Todd Kennedy [Tue, 13 Jun 2017 00:33:51 +0000 (00:33 +0000)]
Merge "Don't log all instant app resolutions" into oc-dev
am:
3ef0b8260f
Change-Id: I4ef141816c67957b0302be814315e2e739406c31
Todd Kennedy [Tue, 13 Jun 2017 00:33:45 +0000 (00:33 +0000)]
Merge "Don't log all instant app resolutions" into oc-dev am:
3ef0b8260f
am:
5ca9d413f8
Change-Id: I10e7c59edb955ba537a12bd52f7117b382d46d7f
Android Build Merger (Role) [Tue, 13 Jun 2017 00:33:14 +0000 (00:33 +0000)]
Merge "Merge changes from topic 'sysui-tooltip' into oc-dev am:
3fbcec5b86 am:
7e21054200" into oc-dr1-dev-plus-aosp
Vladislav Kaznacheev [Tue, 13 Jun 2017 00:32:20 +0000 (00:32 +0000)]
Merge changes from topic 'sysui-tooltip' into oc-dev am:
3fbcec5b86
am:
7e21054200
Change-Id: Icfe6bb79c13c6e0ef925f30933f7831978a2886c
Android Build Merger (Role) [Tue, 13 Jun 2017 00:31:48 +0000 (00:31 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c2a12b658 -s ours am:
e887d21330 -s ours" into oc-dr1-dev-plus-aosp
Vladislav Kaznacheev [Tue, 13 Jun 2017 00:31:02 +0000 (00:31 +0000)]
Merge changes from topic 'sysui-tooltip' into oc-dev
am:
3fbcec5b86
Change-Id: I7affdad6abfb283c0eec6718797f7d8580ea507b
Android Build Merger (Role) [Tue, 13 Jun 2017 00:30:24 +0000 (00:30 +0000)]
Merge "Merge "resolve merge conflicts of
8f1d13300f73 to oc-dr1-dev" into oc-dr1-dev am:
c14f46b135" into oc-dr1-dev-plus-aosp
Jorim Jaggi [Tue, 13 Jun 2017 00:29:15 +0000 (00:29 +0000)]
Merge "resolve merge conflicts of
8f1d13300f73 to oc-dr1-dev" into oc-dr1-dev
am:
c14f46b135
Change-Id: Iaab3c2094a3f2e905097f47ed24276cc412d0b93
Bill Yi [Tue, 13 Jun 2017 00:29:07 +0000 (00:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c2a12b658 -s ours
am:
e887d21330 -s ours
Change-Id: Ie236dae37b227cf65c837e0efea1ea1f9e9aa9b3
Pankaj Kanwar [Tue, 13 Jun 2017 00:28:42 +0000 (00:28 +0000)]
Merge "Address IMSI privacy issues."
Bill Yi [Tue, 13 Jun 2017 00:27:05 +0000 (00:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7c2a12b658 -s ours
Change-Id: I5f257f746717037d275e025c80581d1f4cccc67d
Will Brazil [Tue, 13 Jun 2017 00:26:49 +0000 (00:26 +0000)]
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am:
71029bf631
am:
5884f6ce0d
Change-Id: I725739aed3207992022aa500bb99072410a9a305
Will Brazil [Tue, 13 Jun 2017 00:24:40 +0000 (00:24 +0000)]
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev
am:
71029bf631
Change-Id: I99c6322d7e06262861eb0bb8be4ce8d4572ffbae
Jorim Jaggi [Tue, 13 Jun 2017 00:21:21 +0000 (00:21 +0000)]
Merge "resolve merge conflicts of
8f1d13300f73 to oc-dr1-dev" into oc-dr1-dev
Jorim Jaggi [Tue, 13 Jun 2017 00:20:35 +0000 (00:20 +0000)]
Merge "resolve merge conflicts of
963fed0345c5 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Tue, 13 Jun 2017 00:14:55 +0000 (00:14 +0000)]
Merge "Active camera apps can defy reserved cache space." into oc-dr1-dev
am:
f7dc56ecc9
Change-Id: Ic66cdb0548cf8c973214364843cf147ac5d231be
pkanwar [Tue, 21 Feb 2017 03:23:55 +0000 (19:23 -0800)]
Address IMSI privacy issues.
Added getCarrierInfoForImsiEncryption and
setCarrierInfoForImsiEncryption methods.
CP from Master
Bug:
35606429
Test: runtest --path ..ImsiEncryptionInfoTest.java
Change-Id: I62bdc8ac5e57b749fc5675c28579ec2d9183643d
Bill Yi [Tue, 13 Jun 2017 00:10:34 +0000 (17:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia5c4fec39dd96d826c34c06ea398e05fb53e3328
Auto-generated-cl: translation import
OSDN Git Service
