Bill Yi
|
47bb41b1bb
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 1190614529 -s ours
Change-Id: Ide4638e5f3a11cc9457cf9ddbf61ecf748967491
|
2017-06-13 02:30:08 +00:00 |
|
TreeHugger Robot
|
1190614529
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
|
2017-06-13 02:20:39 +00:00 |
|
Winson Chung
|
53ee05b34a
|
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev am: b1cdc17dfb
am: 87997ce838
Change-Id: Ib22c951e0e17c90a13b9b4e5697eb5127a1011ba
|
2017-06-13 01:51:00 +00:00 |
|
Android Build Merger (Role)
|
1bbc25d903
|
Merge "Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev am: 43dc06a9a9" into oc-dr1-dev-plus-aosp
|
2017-06-13 01:48:21 +00:00 |
|
Etan Cohen
|
d3653e65ad
|
Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev
am: 43dc06a9a9
Change-Id: I5d163be24053eba0592dddf637fdd89373c8fa15
|
2017-06-13 01:46:09 +00:00 |
|
Winson Chung
|
94bbf483e3
|
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev am: b1cdc17dfb
am: ebc74796e4
Change-Id: Id4818ff5e203cb2aa40079ed7af24c4b84a957ba
|
2017-06-13 01:45:31 +00:00 |
|
Winson Chung
|
87997ce838
|
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev
am: b1cdc17dfb
Change-Id: I987d923b923e289baa76d5155cf6a7fe4d9ece6a
|
2017-06-13 01:41:18 +00:00 |
|
Winson Chung
|
ebc74796e4
|
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev
am: b1cdc17dfb
Change-Id: I54fcc6a340e24beae112fcd5753a1b60bb586c24
|
2017-06-13 01:37:34 +00:00 |
|
TreeHugger Robot
|
43dc06a9a9
|
Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev
|
2017-06-13 01:34:48 +00:00 |
|
Android Build Merger (Role)
|
d681a81d89
|
Merge "Merge "Protect broadcast used in settings for bond cancel" into oc-dev am: 68a4c91bb4 am: 2ddb92f2d9" into oc-dr1-dev-plus-aosp
|
2017-06-13 01:19:49 +00:00 |
|
Marie Janssen
|
2538dce783
|
Merge "Protect broadcast used in settings for bond cancel" into oc-dev am: 68a4c91bb4
am: 2ddb92f2d9
Change-Id: Iede1ea0f5f9409538295b3861e2343647ba51026
|
2017-06-13 01:18:53 +00:00 |
|
TreeHugger Robot
|
b1cdc17dfb
|
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev
|
2017-06-13 01:18:50 +00:00 |
|
Android Build Merger (Role)
|
1324c577e7
|
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
|
2017-06-13 01:18:31 +00:00 |
|
Wale Ogunwale
|
3db377d832
|
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am: e1e0db8ca9
am: 5323b2d4cd
Change-Id: I659c818c815b46d666986b1a1224fd4d4f57e56e
|
2017-06-13 01:17:33 +00:00 |
|
Android Build Merger (Role)
|
61c6f9f204
|
Merge "Merge "Protect broadcast used in settings for bond cancel" into oc-dev am: 68a4c91bb4 am: 4c342c8a98" into oc-dr1-dev-plus-aosp
|
2017-06-13 01:17:21 +00:00 |
|
Tianjie Xu
|
6284825f22
|
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am: f40f297546
am: c7fed42403
Change-Id: I196fe22ce901383f3349b99823f066d1226fa4fb
|
2017-06-13 01:14:58 +00:00 |
|
Marie Janssen
|
6fdf825e2d
|
Merge "Protect broadcast used in settings for bond cancel" into oc-dev am: 68a4c91bb4
am: 4c342c8a98
Change-Id: Ia608d4af6afda14097a94013bf2dbe64962ebd74
|
2017-06-13 01:14:33 +00:00 |
|
Android Build Merger (Role)
|
a109b25895
|
Merge "Merge "Address IMSI privacy issues." am: ef6b81e5b2 am: 91a4d3df01 am: 3f095ca368" into oc-dr1-dev-plus-aosp
|
2017-06-13 01:11:01 +00:00 |
|
Pankaj Kanwar
|
8111026c7a
|
Merge "Address IMSI privacy issues." am: ef6b81e5b2 am: 91a4d3df01
am: 3f095ca368
Change-Id: I3f9a2f48e8b45b7625c364983b2b3d342e70d5d0
|
2017-06-13 01:09:44 +00:00 |
|
Android Build Merger (Role)
|
e17ea3eb21
|
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
|
2017-06-13 01:09:21 +00:00 |
|
Wale Ogunwale
|
a5e833e846
|
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am: e1e0db8ca9
am: 90159a2492
Change-Id: I0092411f5b8bef853b55e6ffe7bdf700876f7715
|
2017-06-13 01:08:25 +00:00 |
|
Robert Carr
|
00c2e52c6f
|
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am: 42b3610adc
am: aec6b4749a
Change-Id: Ic8bbda9b2fc76253c70e9f5cd15d6a32b212b50d
|
2017-06-13 01:06:32 +00:00 |
|
Marie Janssen
|
2ddb92f2d9
|
Merge "Protect broadcast used in settings for bond cancel" into oc-dev
am: 68a4c91bb4
Change-Id: Ifdb4b625f21dcda5248071263aaf6936158efb39
|
2017-06-13 01:04:55 +00:00 |
|
Wale Ogunwale
|
5323b2d4cd
|
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev
am: e1e0db8ca9
Change-Id: I2d854e36c31a8fa1cf74e5c5a536969ee94dc79b
|
2017-06-13 01:01:51 +00:00 |
|
Tianjie Xu
|
c7fed42403
|
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
am: f40f297546
Change-Id: Id60cf7cf4b82f17fd094fa011bb54a543e636f48
|
2017-06-13 00:58:53 +00:00 |
|
Jorim Jaggi
|
bda5530d2a
|
Merge "Attempted fix for navigation bar flicker" into oc-dev am: bbd7dfc0a4
am: 20eb74681f
Change-Id: I9dc34fe898c8ce9f5c1babfa73bf619c0e69a494
|
2017-06-13 00:54:18 +00:00 |
|
Robert Carr
|
aec6b4749a
|
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
am: 42b3610adc
Change-Id: I3238399a26917f80bd4e33bb20142f62076e6f4f
|
2017-06-13 00:54:10 +00:00 |
|
Marie Janssen
|
4c342c8a98
|
Merge "Protect broadcast used in settings for bond cancel" into oc-dev
am: 68a4c91bb4
Change-Id: I3dc46eca98c859c540d528cb8a4a409587a25383
|
2017-06-13 00:51:09 +00:00 |
|
Android Build Merger (Role)
|
fd79a77d7b
|
Merge "Merge "Improve developer docs for storage APIs." into oc-dev am: 05b52d8ba5 am: 0ba24ed694" into oc-dr1-dev-plus-aosp
|
2017-06-13 00:49:19 +00:00 |
|
Jeff Sharkey
|
c317ae5d87
|
Merge "Improve developer docs for storage APIs." into oc-dev am: 05b52d8ba5
am: 0ba24ed694
Change-Id: I8a33e050caba8a7f80b64709174a867a50857571
|
2017-06-13 00:48:06 +00:00 |
|
Android Build Merger (Role)
|
f1e10a96b9
|
Merge "Merge "Don't log all instant app resolutions" into oc-dev am: 3ef0b8260f am: f734de79cc" into oc-dr1-dev-plus-aosp
|
2017-06-13 00:47:43 +00:00 |
|
Android Build Merger (Role)
|
1fa1f100a3
|
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
|
2017-06-13 00:47:25 +00:00 |
|
Todd Kennedy
|
b18aadef6a
|
Merge "Don't log all instant app resolutions" into oc-dev am: 3ef0b8260f
am: f734de79cc
Change-Id: Ie507e44ad423296de9ab545c1afcd881273b30e1
|
2017-06-13 00:46:50 +00:00 |
|
Android Build Merger (Role)
|
e1f07567b5
|
Merge "Merge changes from topic 'sysui-tooltip' into oc-dev am: 3fbcec5b86 am: bc168cf9d5" into oc-dr1-dev-plus-aosp
|
2017-06-13 00:46:28 +00:00 |
|
Tianjie Xu
|
40b3f29341
|
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am: f40f297546
am: d04d501ce7
Change-Id: Ide407c6ccc5a42c9a57acb1652b19db99bee42a8
|
2017-06-13 00:46:27 +00:00 |
|
Android Build Merger (Role)
|
3c63cef6bf
|
Merge "Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am: 42b3610adc am: 2fa5800da9" into oc-dr1-dev-plus-aosp
|
2017-06-13 00:46:01 +00:00 |
|
TreeHugger Robot
|
68a4c91bb4
|
Merge "Protect broadcast used in settings for bond cancel" into oc-dev
|
2017-06-13 00:45:45 +00:00 |
|
Vladislav Kaznacheev
|
dee9d26225
|
Merge changes from topic 'sysui-tooltip' into oc-dev am: 3fbcec5b86
am: bc168cf9d5
Change-Id: I5b2320564692df6fa14bfeb49fcf350fc4cb2d9d
|
2017-06-13 00:45:32 +00:00 |
|
Pankaj Kanwar
|
3f095ca368
|
Merge "Address IMSI privacy issues." am: ef6b81e5b2
am: 91a4d3df01
Change-Id: I15e60cbbff06d7f66e86d755ae87b2e3513ca4a9
|
2017-06-13 00:45:04 +00:00 |
|
Robert Carr
|
cb6196277f
|
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am: 42b3610adc
am: 2fa5800da9
Change-Id: I83c4a2e592b7385b1aa6dc3157bd6ea5950c624a
|
2017-06-13 00:43:56 +00:00 |
|
Bill Yi
|
ed30217c42
|
Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c2a12b658 -s ours
am: 5a3998fe38 -s ours
Change-Id: Ic55a5b3c7cc13af454abc3fbb4f1dba7be64d107
|
2017-06-13 00:43:00 +00:00 |
|
Jorim Jaggi
|
20eb74681f
|
Merge "Attempted fix for navigation bar flicker" into oc-dev
am: bbd7dfc0a4
Change-Id: I80a618eb59f0479060a69ca4f0be8ac883a8d48d
|
2017-06-13 00:41:40 +00:00 |
|
Android Build Merger (Role)
|
4fabf266b7
|
Merge "Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am: 71029bf631 am: 938fe5c968" into oc-dr1-dev-plus-aosp
|
2017-06-13 00:39:27 +00:00 |
|
Android Build Merger (Role)
|
8f76d06c94
|
Merge "Merge "Attempted fix for navigation bar flicker" into oc-dev am: bbd7dfc0a4 am: 78c9744f41" into oc-dr1-dev-plus-aosp
|
2017-06-13 00:39:16 +00:00 |
|
Will Brazil
|
f9ed6dd291
|
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am: 71029bf631
am: 938fe5c968
Change-Id: I147dea17afffba890b5bb3108d061bdf4f7c76f7
|
2017-06-13 00:38:29 +00:00 |
|
Jorim Jaggi
|
68a7011894
|
Merge "Attempted fix for navigation bar flicker" into oc-dev am: bbd7dfc0a4
am: 78c9744f41
Change-Id: I985f319bb1cf6627abef2a7dafd9fafd64309264
|
2017-06-13 00:38:04 +00:00 |
|
Android Build Merger (Role)
|
1270b399cc
|
Merge "Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162 am: 00bce50dc3 am: 297dbb86fe" into oc-dr1-dev-plus-aosp
|
2017-06-13 00:37:43 +00:00 |
|
Pankaj Kanwar
|
91a4d3df01
|
Merge "Address IMSI privacy issues."
am: ef6b81e5b2
Change-Id: I41c06fc9bf9012f93e10b59c49d5a7314331ea5f
|
2017-06-13 00:37:13 +00:00 |
|
Marie Janssen
|
f1b9ee029d
|
Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162 am: 00bce50dc3
am: 297dbb86fe
Change-Id: I630bc69705870d4cd7252da9bc8501c564950393
|
2017-06-13 00:36:46 +00:00 |
|
Android Build Merger (Role)
|
08b598fcfe
|
Merge "Merge "Improve developer docs for storage APIs." into oc-dev am: 05b52d8ba5 am: f96c9a0fa2" into oc-dr1-dev-plus-aosp
|
2017-06-13 00:36:22 +00:00 |
|