git.osdn.net Git - android-x86/frameworks-base.git/log

Erik Kline [Tue, 13 Jun 2017 03:48:24 +0000 (03:48 +0000)]

Merge "Only disable Wi-Fi IP serving on specific interface, if available" am: 6428e1a4d4 am: e675273dbc am: e13b93c585
am: 118e0e87e7

Change-Id: Id8d9c3f67f7a850af69069abee86adfc62841b28

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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"

commit | commitdiff | tree

Bill Yi [Tue, 13 Jun 2017 02:59:10 +0000 (02:59 +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
am: 7729edee10 -s ours

Change-Id: If4afa0cf25e4c83097ffebb80fae620865f9e6e4

commit | commitdiff | tree

Bill Yi [Tue, 13 Jun 2017 02:57:02 +0000 (02:57 +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
am: cea026e027 -s ours

Change-Id: I513fd5f60ed065f483a955f96fcf6db0fbc6ca4a

commit | commitdiff | tree

Bill Yi [Tue, 13 Jun 2017 02:54:06 +0000 (02:54 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 34cfd78f8e -s ours
am: 50a405cf2c -s ours

Change-Id: I3c90feee62ffc8cf88e9f74859f8e818f019d3e6

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Tue, 13 Jun 2017 02:35:18 +0000 (02:35 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 1190614529 -s ours
am: 47bb41b1bb -s ours

Change-Id: I12c93763e3ab6bb471c9e7049789fdc2e65406e4

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Tue, 13 Jun 2017 02:31:23 +0000 (02:31 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Winson Chung [Tue, 13 Jun 2017 02:28:13 +0000 (02:28 +0000)]

Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev am: b1cdc17dfb am: 87997ce838
am: 53ee05b34a

Change-Id: Ia0f581109cffb3a695698537aefc55408287cb45

commit | commitdiff | tree

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

commit | commitdiff | tree

Etan Cohen [Tue, 13 Jun 2017 02:25:54 +0000 (02:25 +0000)]

Merge "Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev am: 43dc06a9a9" into oc-dr1-dev-plus-aosp
am: 1bbc25d903

Change-Id: I6db6577b701977806cd14014a4700d71619915c4

commit | commitdiff | tree

Winson Chung [Tue, 13 Jun 2017 02:22:41 +0000 (02:22 +0000)]

Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev am: b1cdc17dfb am: ebc74796e4
am: 94bbf483e3

Change-Id: I9996b6f19b3558e922e229839f8ae0f52cc7c812

commit | commitdiff | tree

TreeHugger Robot [Tue, 13 Jun 2017 02:20:34 +0000 (02:20 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 13 Jun 2017 02:18:42 +0000 (02:18 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev

commit | commitdiff | tree

Marie Janssen [Tue, 13 Jun 2017 01:54:18 +0000 (01:54 +0000)]

Merge "Merge "Protect broadcast used in settings for bond cancel" into oc-dev am: 68a4c91bb4 am: 2ddb92f2d9" into oc-dr1-dev-plus-aosp
am: d681a81d89

Change-Id: Ic8891f09e36a7610418c8168722628e60c079131

commit | commitdiff | tree

Wale Ogunwale [Tue, 13 Jun 2017 01:51:59 +0000 (01:51 +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
am: 1324c577e7

Change-Id: If243540cf28bd67bd659c1647c1b175ff72daba3

commit | commitdiff | tree

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

commit | commitdiff | tree

Marie Janssen [Tue, 13 Jun 2017 01:49:30 +0000 (01:49 +0000)]

Merge "Merge "Protect broadcast used in settings for bond cancel" into oc-dev am: 68a4c91bb4 am: 4c342c8a98" into oc-dr1-dev-plus-aosp
am: 61c6f9f204

Change-Id: I883466888853a4914c87ab99ec81795d2af95123

commit | commitdiff | tree

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

commit | commitdiff | tree

Tianjie Xu [Tue, 13 Jun 2017 01:46:53 +0000 (01:46 +0000)]

Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am: f40f297546 am: c7fed42403
am: 6284825f22

Change-Id: I4995070433e9f35a30e47aaf7045eeb14d31dc5b

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Pankaj Kanwar [Tue, 13 Jun 2017 01:41:30 +0000 (01:41 +0000)]

Merge "Merge "Address IMSI privacy issues." am: ef6b81e5b2 am: 91a4d3df01 am: 3f095ca368" into oc-dr1-dev-plus-aosp
am: a109b25895

Change-Id: Id04d5216beac797f4086916f0fdfefd23c2007cd

commit | commitdiff | tree

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

commit | commitdiff | tree

Wale Ogunwale [Tue, 13 Jun 2017 01:38:47 +0000 (01:38 +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
am: e17ea3eb21

Change-Id: I244f3d4af910c73b4c402dd0e93d92bd6ead849e

commit | commitdiff | tree

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

commit | commitdiff | tree

Robert Carr [Tue, 13 Jun 2017 01:36:05 +0000 (01:36 +0000)]

Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am: 42b3610adc am: aec6b4749a
am: 00c2e52c6f

Change-Id: I119bd9a2828c91c25622e4d2c93e8579bbc63726

commit | commitdiff | tree

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

commit | commitdiff | tree

Jorim Jaggi [Tue, 13 Jun 2017 01:33:46 +0000 (01:33 +0000)]

Merge "Attempted fix for navigation bar flicker" into oc-dev am: bbd7dfc0a4 am: 20eb74681f
am: bda5530d2a

Change-Id: I2f2b93c2c06a52fbed7b26ece806c7bc88238527

commit | commitdiff | tree

Jeff Sharkey [Tue, 13 Jun 2017 01:30:52 +0000 (01:30 +0000)]

Merge "Merge "Improve developer docs for storage APIs." into oc-dev am: 05b52d8ba5 am: 0ba24ed694" into oc-dr1-dev-plus-aosp
am: fd79a77d7b

Change-Id: Iee648e63d925e4ae1a1df72f9d0fb26b8cf1c5dd

commit | commitdiff | tree

Todd Kennedy [Tue, 13 Jun 2017 01:28:19 +0000 (01:28 +0000)]

Merge "Merge "Don't log all instant app resolutions" into oc-dev am: 3ef0b8260f am: f734de79cc" into oc-dr1-dev-plus-aosp
am: f1e10a96b9

Change-Id: I6250095f0522d044b62ae3d660d8446f2107d7cd

commit | commitdiff | tree

Tianjie Xu [Tue, 13 Jun 2017 01:25:33 +0000 (01:25 +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
am: 1fa1f100a3

Change-Id: I0f0da929e78146408def47e03ae9f2425849d7e9

commit | commitdiff | tree

Vladislav Kaznacheev [Tue, 13 Jun 2017 01:23:10 +0000 (01:23 +0000)]

Merge "Merge changes from topic 'sysui-tooltip' into oc-dev am: 3fbcec5b86 am: bc168cf9d5" into oc-dr1-dev-plus-aosp
am: e1f07567b5

Change-Id: Id519ecd8009af784e7f4d087c2beca0bc854d9cf

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Robert Carr [Tue, 13 Jun 2017 01:13:37 +0000 (01:13 +0000)]

Merge "Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am: 42b3610adc am: 2fa5800da9" into oc-dr1-dev-plus-aosp
am: 3c63cef6bf

Change-Id: I949b09e52f82ae947789489cff5cffc94d438a68

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Tue, 13 Jun 2017 01:10:46 +0000 (01:10 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c2a12b658 -s ours am: 5a3998fe38 -s ours
am: ed30217c42 -s ours

Change-Id: If8d06784fb6f699ef8e0bb999d0095ee04eff392

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Will Brazil [Tue, 13 Jun 2017 01:08:04 +0000 (01:08 +0000)]

Merge "Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am: 71029bf631 am: 938fe5c968" into oc-dr1-dev-plus-aosp
am: 4fabf266b7

Change-Id: I10973ffac696d28d300d00d9261f2d05502c5c00

commit | commitdiff | tree

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

commit | commitdiff | tree

Jorim Jaggi [Tue, 13 Jun 2017 01:05:09 +0000 (01:05 +0000)]

Merge "Merge "Attempted fix for navigation bar flicker" into oc-dev am: bbd7dfc0a4 am: 78c9744f41" into oc-dr1-dev-plus-aosp
am: 8f76d06c94

Change-Id: Ibba2531d1fbf0b440fb19672b60938dd93cd40e2

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Marie Janssen [Tue, 13 Jun 2017 01:01:23 +0000 (01:01 +0000)]

Merge "Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162 am: 00bce50dc3 am: 297dbb86fe" into oc-dr1-dev-plus-aosp
am: 1270b399cc

Change-Id: I77469544f4cd29f2393e4310ff83ed1da4d5ecfe

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Tue, 13 Jun 2017 00:57:38 +0000 (00:57 +0000)]

Merge "Merge "Improve developer docs for storage APIs." into oc-dev am: 05b52d8ba5 am: f96c9a0fa2" into oc-dr1-dev-plus-aosp
am: 08b598fcfe

Change-Id: I6dd330a240f1725b59e79111fd3bfc124a3fb897

commit | commitdiff | tree

Todd Kennedy [Tue, 13 Jun 2017 00:54:49 +0000 (00:54 +0000)]

Merge "Merge "Don't log all instant app resolutions" into oc-dev am: 3ef0b8260f am: 5ca9d413f8" into oc-dr1-dev-plus-aosp
am: 6c240e311b

Change-Id: If93120172fb811743d876984e2622d09e9c0e1a2

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Vladislav Kaznacheev [Tue, 13 Jun 2017 00:49:47 +0000 (00:49 +0000)]

Merge "Merge changes from topic 'sysui-tooltip' into oc-dev am: 3fbcec5b86 am: 7e21054200" into oc-dr1-dev-plus-aosp
am: 4c4cf27212

Change-Id: Ibef05a31f18d50b5460af1c23f676e061ad81e6c

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Tue, 13 Jun 2017 00:47:23 +0000 (00:47 +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
am: 29f0c7bb81 -s ours

Change-Id: I1d4fd8e29f86269ea51ad1d1f996fcf108649a62

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jorim Jaggi [Tue, 13 Jun 2017 00:45:02 +0000 (00:45 +0000)]

Merge "Merge "resolve merge conflicts of 8f1d13300f73 to oc-dr1-dev" into oc-dr1-dev am: c14f46b135" into oc-dr1-dev-plus-aosp
am: 7fbd6a02dd

Change-Id: I3baf62e4e287b3aff3ee2def1becdfe6c795d02f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Pankaj Kanwar [Tue, 13 Jun 2017 00:37:13 +0000 (00:37 +0000)]

Merge "Address IMSI privacy issues."
am: ef6b81e5b2

Change-Id: I41c06fc9bf9012f93e10b59c49d5a7314331ea5f

commit | commitdiff | tree

Will Brazil [Tue, 13 Jun 2017 00:36:59 +0000 (00:36 +0000)]

Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am: 71029bf631 am: 5884f6ce0d
am: 308a19531e

Change-Id: I2db2e50ac8ca7b85429271eb649a2698041d1df0

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jorim Jaggi [Tue, 13 Jun 2017 00:34:49 +0000 (00:34 +0000)]

Merge "resolve merge conflicts of 963fed0345c5 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
am: 827dfe078f

Change-Id: Ibe3a988346ab28f5e74286d327194e2e9f2a67fd