OSDN Git Service
Android Build Merger (Role) [Thu, 6 Jul 2017 03:45:41 +0000 (03:45 +0000)]
Merge "Merge "Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master am:
e62a5fc7d3" into oc-dev-plus-aosp am:
f9d61556b6" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 03:44:49 +0000 (03:44 +0000)]
Merge "Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446 am:
10f5f8dde5" into oc-dev-plus-aosp am:
b4efa159a1" into oc-dr1-dev-plus-aosp
Mathieu Chartier [Thu, 6 Jul 2017 03:44:29 +0000 (03:44 +0000)]
Merge "Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master am:
e62a5fc7d3" into oc-dev-plus-aosp
am:
f9d61556b6
Change-Id: I77a2e1556bae4cc46907e1862ffe5e9585b68394
Android Build Merger (Role) [Thu, 6 Jul 2017 03:44:26 +0000 (03:44 +0000)]
Merge "Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev am:
7ee9ec59d8" into oc-dr1-dev-plus-aosp
Mathieu Chartier [Thu, 6 Jul 2017 03:43:15 +0000 (03:43 +0000)]
Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446 am:
10f5f8dde5" into oc-dev-plus-aosp
am:
b4efa159a1
Change-Id: I69e599f342bd8f9fac492a1714eedcea2887097f
Winson Chung [Thu, 6 Jul 2017 03:43:07 +0000 (03:43 +0000)]
Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev
am:
7ee9ec59d8
Change-Id: I2a51560ea4f07b3eacf882e74385c20d4e416c35
Mathieu Chartier [Thu, 6 Jul 2017 03:42:45 +0000 (03:42 +0000)]
Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446 am:
10f5f8dde5" into oc-dev-plus-aosp
am:
b4efa159a1
Change-Id: Iafc99265978f5352c35c13b9ea1329769bc23db0
Android Build Merger (Role) [Thu, 6 Jul 2017 03:37:55 +0000 (03:37 +0000)]
Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446 am:
10f5f8dde5 am:
94edf0241f" into oc-dr1-dev-plus-aosp
Mathieu Chartier [Thu, 6 Jul 2017 03:36:23 +0000 (03:36 +0000)]
Merge "ProcessStats: fix uss average value offset" am:
b355b7f446 am:
10f5f8dde5
am:
94edf0241f
Change-Id: I7bef329f5972b61cba5a4b3dce66970d8c0a7802
Mathieu Chartier [Thu, 6 Jul 2017 03:36:11 +0000 (03:36 +0000)]
Merge "ProcessStats: fix uss average value offset" am:
b355b7f446 am:
10f5f8dde5
am:
94edf0241f
Change-Id: Ifb85ebb263e7dad28f5995950082ed23db4c0c37
Winson Chung [Thu, 6 Jul 2017 03:35:50 +0000 (03:35 +0000)]
Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 03:33:18 +0000 (03:33 +0000)]
Merge "Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master am:
e62a5fc7d3" into oc-dev-plus-aosp
Mathieu Chartier [Thu, 6 Jul 2017 03:31:51 +0000 (03:31 +0000)]
Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master
am:
e62a5fc7d3
Change-Id: I1c87dc82499ac1a53ba3a6c14d79586b4d7db986
Android Build Merger (Role) [Thu, 6 Jul 2017 03:31:10 +0000 (03:31 +0000)]
Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446 am:
10f5f8dde5" into oc-dev-plus-aosp
Mathieu Chartier [Thu, 6 Jul 2017 03:29:49 +0000 (03:29 +0000)]
Merge "ProcessStats: fix uss average value offset" am:
b355b7f446
am:
10f5f8dde5
Change-Id: I80156aebfba5f0a8e914163b420a2676658e9826
Mathieu Chartier [Thu, 6 Jul 2017 03:28:05 +0000 (03:28 +0000)]
Merge "ProcessStats: fix uss average value offset" am:
b355b7f446
am:
10f5f8dde5
Change-Id: I213eef696c40c0260b32c71fac18b1e5063dc77d
Android Build Merger (Role) [Thu, 6 Jul 2017 03:27:09 +0000 (03:27 +0000)]
Merge "Bluetooth: Display battery level of connected devices am:
6258aae548" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 03:25:23 +0000 (03:25 +0000)]
Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master
Jack He [Thu, 6 Jul 2017 03:25:02 +0000 (03:25 +0000)]
Bluetooth: Display battery level of connected devices
am:
6258aae548
Change-Id: I24768c7c4353e1fe0100206f402daa34df54517f
Mathieu Chartier [Thu, 6 Jul 2017 03:23:39 +0000 (03:23 +0000)]
Merge "ProcessStats: fix uss average value offset"
am:
b355b7f446
Change-Id: I8ea2d783c0e9c749e923b7a37b2268d0c186851e
Jack He [Thu, 6 Jul 2017 03:23:35 +0000 (03:23 +0000)]
Bluetooth: Display battery level of connected devices
am:
6258aae548
Change-Id: I511f71b349b08652e22698313e1c48139f426eb5
Mathieu Chartier [Thu, 6 Jul 2017 03:23:21 +0000 (03:23 +0000)]
Merge "ProcessStats: fix uss average value offset"
am:
b355b7f446
Change-Id: I3347a5b4d3df895b7066c5117f37003e4603ebd9
Mathieu Chartier [Thu, 6 Jul 2017 03:13:52 +0000 (03:13 +0000)]
Merge "ProcessStats: fix uss average value offset"
Android Build Merger (Role) [Thu, 6 Jul 2017 02:31:24 +0000 (02:31 +0000)]
Merge "Merge "Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master am:
809edde8fd" into oc-dev-plus-aosp am:
d0d81258a4" into oc-dr1-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 02:29:14 +0000 (02:29 +0000)]
Merge "Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master am:
809edde8fd" into oc-dev-plus-aosp
am:
d0d81258a4
Change-Id: I8aaf9e05e76642d5f6bb975929f39cdaf0835fdd
Android Build Merger (Role) [Thu, 6 Jul 2017 02:28:49 +0000 (02:28 +0000)]
Merge "Merge "Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master am:
809edde8fd" into oc-dev-plus-aosp am:
d0d81258a4" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 02:27:09 +0000 (02:27 +0000)]
Merge "Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master am:
809edde8fd am:
8f35f915a9" into oc-dr1-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 02:27:08 +0000 (02:27 +0000)]
Merge "Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master am:
809edde8fd" into oc-dev-plus-aosp
am:
d0d81258a4
Change-Id: I4ad0804618a37731c31830aec4ea1dad5c700014
Hall Liu [Thu, 6 Jul 2017 02:25:08 +0000 (02:25 +0000)]
Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master am:
809edde8fd
am:
8f35f915a9
Change-Id: I1762a29fc24d09fbbe5313889e48daae7e29515b
Hall Liu [Thu, 6 Jul 2017 02:24:04 +0000 (02:24 +0000)]
Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master am:
809edde8fd
am:
8f35f915a9
Change-Id: Ib77007f944fe74cb76a2c0987aabcc376810038f
Android Build Merger (Role) [Thu, 6 Jul 2017 02:19:35 +0000 (02:19 +0000)]
Merge "Merge "Update DownloadRequest API" am:
fa42eea98f am:
5e7c98bb6a am:
812d0866b1" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 02:18:06 +0000 (02:18 +0000)]
Merge "Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master am:
809edde8fd" into oc-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 02:17:56 +0000 (02:17 +0000)]
Merge "Update DownloadRequest API" am:
fa42eea98f am:
5e7c98bb6a
am:
812d0866b1
Change-Id: I56a3f08b02c828c750f859311baa201bb7e3b569
Hall Liu [Thu, 6 Jul 2017 02:16:11 +0000 (02:16 +0000)]
Merge "Update DownloadRequest API" am:
fa42eea98f am:
5e7c98bb6a
am:
812d0866b1
Change-Id: I10eca003e37657c6582718c70c39ac7f54badbae
Hall Liu [Thu, 6 Jul 2017 02:15:43 +0000 (02:15 +0000)]
Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master
am:
809edde8fd
Change-Id: I297c4d5917b63f0215c2907f32b8e23d0f4ee4bf
Hall Liu [Thu, 6 Jul 2017 02:14:40 +0000 (02:14 +0000)]
Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master
am:
809edde8fd
Change-Id: Ie3c620a0e45f85ef0446d6d58865d6f55b731531
Hall Liu [Thu, 6 Jul 2017 02:10:30 +0000 (02:10 +0000)]
Merge "Update DownloadRequest API" am:
fa42eea98f
am:
5e7c98bb6a
Change-Id: Ie5a323b8a0c96f7a7f63eea1b0163bb7e5bf4ea7
Android Build Merger (Role) [Thu, 6 Jul 2017 02:07:32 +0000 (02:07 +0000)]
Merge "Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc" into stage-aosp-master am:
17f2f1633b" into oc-dev-plus-aosp am:
bdbe454b7a" into oc-dr1-dev-plus-aosp
Hiroki Yamamoto [Thu, 6 Jul 2017 02:06:28 +0000 (02:06 +0000)]
Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc" into stage-aosp-master am:
17f2f1633b" into oc-dev-plus-aosp
am:
bdbe454b7a
Change-Id: I341dcd5139cb17c0375837e6b1d64a683a75ce64
Android Build Merger (Role) [Thu, 6 Jul 2017 02:06:14 +0000 (02:06 +0000)]
Merge "Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc" into stage-aosp-master am:
17f2f1633b" into oc-dev-plus-aosp am:
bdbe454b7a" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 02:06:02 +0000 (02:06 +0000)]
Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc am:
1a6d0d753e" into oc-dev-plus-aosp am:
808ae634dd" into oc-dr1-dev-plus-aosp
Hiroki Yamamoto [Thu, 6 Jul 2017 02:05:20 +0000 (02:05 +0000)]
Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc" into stage-aosp-master am:
17f2f1633b" into oc-dev-plus-aosp
am:
bdbe454b7a
Change-Id: Ie830aa79d8a380fcf85fac617ab183b02819468a
Android Build Merger (Role) [Thu, 6 Jul 2017 02:05:16 +0000 (02:05 +0000)]
Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master
Hiroki Yamamoto [Thu, 6 Jul 2017 02:04:52 +0000 (02:04 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc am:
1a6d0d753e" into oc-dev-plus-aosp
am:
808ae634dd
Change-Id: I1e9c347aa7b3722cda19d1c6f3ec34adb93ea08c
Hiroki Yamamoto [Thu, 6 Jul 2017 02:03:49 +0000 (02:03 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc am:
1a6d0d753e" into oc-dev-plus-aosp
am:
808ae634dd
Change-Id: Ia9b125871b38845184db1bcedfc22ac9df9bb9ee
Hall Liu [Thu, 6 Jul 2017 02:03:42 +0000 (02:03 +0000)]
Merge "Update DownloadRequest API"
am:
fa42eea98f
Change-Id: I0b966f0fa2ca3e1c45bf4932654a3bbc1b2d05eb
Hall Liu [Thu, 6 Jul 2017 02:03:16 +0000 (02:03 +0000)]
Merge "Update DownloadRequest API"
am:
fa42eea98f
Change-Id: I4c822f653900cab34276b2b4ba5fb1a29e948a76
Android Build Merger (Role) [Thu, 6 Jul 2017 02:00:37 +0000 (02:00 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc am:
1a6d0d753e am:
3ccfa35667" into oc-dr1-dev-plus-aosp
Hiroki Yamamoto [Thu, 6 Jul 2017 01:58:59 +0000 (01:58 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc am:
1a6d0d753e
am:
3ccfa35667
Change-Id: I45ba5cbd9eda39c10c5a26405766905e45eaa6ea
Hiroki Yamamoto [Thu, 6 Jul 2017 01:58:38 +0000 (01:58 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc am:
1a6d0d753e
am:
3ccfa35667
Change-Id: Iff5f7c0562be48e8fda71dde5790a41876f125ba
Android Build Merger (Role) [Thu, 6 Jul 2017 01:55:35 +0000 (01:55 +0000)]
Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc" into stage-aosp-master am:
17f2f1633b" into oc-dev-plus-aosp
Hiroki Yamamoto [Thu, 6 Jul 2017 01:54:37 +0000 (01:54 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc" into stage-aosp-master
am:
17f2f1633b
Change-Id: Icfc920a97ab07f01f9c5d9def88f4bcc63bd6058
Android Build Merger (Role) [Thu, 6 Jul 2017 01:53:59 +0000 (01:53 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc am:
1a6d0d753e" into oc-dev-plus-aosp
Hiroki Yamamoto [Thu, 6 Jul 2017 01:53:01 +0000 (01:53 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc
am:
1a6d0d753e
Change-Id: I588cd14481ed540dacd85646f52e7b98d1bc58b9
Hiroki Yamamoto [Thu, 6 Jul 2017 01:52:15 +0000 (01:52 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc
am:
1a6d0d753e
Change-Id: I7e45537f7a81ac42be1a24adeadfbf3f7b665109
Hall Liu [Thu, 6 Jul 2017 01:52:04 +0000 (01:52 +0000)]
Merge "Update DownloadRequest API"
Android Build Merger (Role) [Thu, 6 Jul 2017 01:47:37 +0000 (01:47 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc" into stage-aosp-master
Hiroki Yamamoto [Thu, 6 Jul 2017 01:46:20 +0000 (01:46 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover"
am:
21187ba5cc
Change-Id: I9117f76d5a03d3aa222c87338bd7249184b3041d
Hiroki Yamamoto [Thu, 6 Jul 2017 01:45:13 +0000 (01:45 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover"
am:
21187ba5cc
Change-Id: Iae5a62d77719833dc91c881bd3b90c9ab327a0bf
Treehugger Robot [Thu, 6 Jul 2017 01:30:10 +0000 (01:30 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover"
Jack He [Fri, 30 Jun 2017 00:01:23 +0000 (17:01 -0700)]
Bluetooth: Display battery level of connected devices
* Add handler for BluetoothDevice.ACTION_BATTERY_LEVEL_CHANGED intent
* Check battery level information when UI is updated
* Show battery level in Quick Settings connected device summary line
* Show battery level in Bluetooth Settings connected device summary line
* Show battery level in Bluetooth device details page device summary
line
* Add unit test for CachedBluetoothDevice, change HeadsetProfile and
HidProfile to not final to enable mocking
Bug:
35874078
Test: make, unit test, connect to remote devices, connect/disconnect
profiles
Change-Id: I729048cace73aab29337a8002a2897d2acf22fa6
Android Build Merger (Role) [Thu, 6 Jul 2017 01:08:40 +0000 (01:08 +0000)]
Merge "Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94" into stage-aosp-master am:
6340d93571" into oc-dev-plus-aosp am:
41d52b1bb2 -s ours" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 01:07:19 +0000 (01:07 +0000)]
Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94" into stage-aosp-master am:
6340d93571" into oc-dev-plus-aosp
am:
41d52b1bb2 -s ours
Change-Id: Ib2976993a8d1f1d19b46fd6686ab3a4a30fbdaa7
Android Build Merger (Role) [Thu, 6 Jul 2017 01:06:24 +0000 (01:06 +0000)]
Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94 am:
5ba953cbe9" into oc-dev-plus-aosp am:
c8505e49c5 -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 01:05:08 +0000 (01:05 +0000)]
Merge "Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94" into stage-aosp-master am:
6340d93571" into oc-dev-plus-aosp am:
41d52b1bb2 -s ours" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 01:04:35 +0000 (01:04 +0000)]
Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94 am:
5ba953cbe9" into oc-dev-plus-aosp
am:
c8505e49c5 -s ours
Change-Id: I4b7e18e308c471b65917ed0a85c6083af484842a
Erik Kline [Thu, 6 Jul 2017 01:03:51 +0000 (01:03 +0000)]
Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94" into stage-aosp-master am:
6340d93571" into oc-dev-plus-aosp
am:
41d52b1bb2 -s ours
Change-Id: Ib2f7d0543018067533716a00d44be4e8f4f18743
Android Build Merger (Role) [Thu, 6 Jul 2017 01:02:36 +0000 (01:02 +0000)]
Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94 am:
5ba953cbe9" into oc-dev-plus-aosp am:
c8505e49c5 -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 01:02:18 +0000 (01:02 +0000)]
Merge "Merge "Update the smearing methods in framework." into oc-dr1-dev am:
386d8133c4" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 01:01:13 +0000 (01:01 +0000)]
Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94 am:
5ba953cbe9" into oc-dev-plus-aosp
am:
c8505e49c5 -s ours
Change-Id: I230ff17a200a9c86be7ea65ffd41e88b3fe82156
jackqdyulei [Thu, 6 Jul 2017 01:00:59 +0000 (01:00 +0000)]
Merge "Update the smearing methods in framework." into oc-dr1-dev
am:
386d8133c4
Change-Id: I383384c1cd30e5ab4f88a5e95a9b0068e573fe2d
jackqdyulei [Thu, 6 Jul 2017 01:00:38 +0000 (01:00 +0000)]
Merge "Update the smearing methods in framework." into oc-dr1-dev
am:
386d8133c4
Change-Id: I47f43921f2f18b0163c9e8eae1dd484402b53b49
Android Build Merger (Role) [Thu, 6 Jul 2017 00:57:49 +0000 (00:57 +0000)]
Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94 am:
5ba953cbe9 am:
8c72e188f2 -s ours" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 00:56:47 +0000 (00:56 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94 am:
5ba953cbe9
am:
8c72e188f2 -s ours
Change-Id: I4dad5dbe295dbe3b43da7493e66bc6e35140d3b8
Erik Kline [Thu, 6 Jul 2017 00:55:58 +0000 (00:55 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94 am:
5ba953cbe9
am:
8c72e188f2 -s ours
Change-Id: I6849b0485a6722aacb4b1d76a07c82b3764f5c06
Android Build Merger (Role) [Thu, 6 Jul 2017 00:53:19 +0000 (00:53 +0000)]
Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94" into stage-aosp-master am:
6340d93571" into oc-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 00:51:40 +0000 (00:51 +0000)]
Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94" into stage-aosp-master
am:
6340d93571
Change-Id: Ic206b34a0535c3a8c92e45c3107d4f16985a5cb8
Android Build Merger (Role) [Thu, 6 Jul 2017 00:50:59 +0000 (00:50 +0000)]
Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94 am:
5ba953cbe9" into oc-dev-plus-aosp
TreeHugger Robot [Thu, 6 Jul 2017 00:49:56 +0000 (00:49 +0000)]
Merge "Update the smearing methods in framework." into oc-dr1-dev
Erik Kline [Thu, 6 Jul 2017 00:49:52 +0000 (00:49 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94
am:
5ba953cbe9
Change-Id: Iec17e43ba2df36ef45a55f7055886df7505296af
Erik Kline [Thu, 6 Jul 2017 00:48:24 +0000 (00:48 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94
am:
5ba953cbe9
Change-Id: I87dbd0a8840e57c7959a935e17654a3a4e1b3edf
Android Build Merger (Role) [Thu, 6 Jul 2017 00:43:51 +0000 (00:43 +0000)]
Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94" into stage-aosp-master
Erik Kline [Thu, 6 Jul 2017 00:42:14 +0000 (00:42 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface"
am:
36904fbc94
Change-Id: I7789242c6f574c1d81eb0a5e9527b167d4b3c755
Erik Kline [Thu, 6 Jul 2017 00:41:33 +0000 (00:41 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface"
am:
36904fbc94
Change-Id: Iea47f74dc77b347343726d2ab0ee128e5391767b
Treehugger Robot [Thu, 6 Jul 2017 00:31:44 +0000 (00:31 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface"
Hiroki Yamamoto [Fri, 14 Apr 2017 06:10:15 +0000 (15:10 +0900)]
Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover
Test: do Nfc Bluetooth Handover and wait for the timeout
Bug:
63250718
Change-Id: Ieea8b8f7a07fe90a594ed13ecfefd01e1d60853d
Android Build Merger (Role) [Wed, 5 Jul 2017 23:38:51 +0000 (23:38 +0000)]
Merge "Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am:
484d742af0" into oc-dr1-dev-plus-aosp
Bryce Lee [Wed, 5 Jul 2017 23:37:05 +0000 (23:37 +0000)]
Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev
am:
484d742af0
Change-Id: Id424bf6f16c7fe60607c78189239cb223e8984fd
Bryce Lee [Wed, 5 Jul 2017 23:35:50 +0000 (23:35 +0000)]
Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev
am:
484d742af0
Change-Id: Ib1c1a331ca0ec4a3792bf6fabc0a372b4608e706
Android Build Merger (Role) [Wed, 5 Jul 2017 23:30:10 +0000 (23:30 +0000)]
Merge "Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
4e4b5a2426" into oc-dev-plus-aosp am:
313d31af94" into oc-dr1-dev-plus-aosp
Tobias Thierer [Wed, 5 Jul 2017 23:28:18 +0000 (23:28 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
4e4b5a2426" into oc-dev-plus-aosp
am:
313d31af94
Change-Id: Ie3d89588f8841a5f0d13fe297b7879a26d4f51ce
Android Build Merger (Role) [Wed, 5 Jul 2017 23:27:30 +0000 (23:27 +0000)]
Merge "Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
4e4b5a2426" into oc-dev-plus-aosp am:
81d0134a0f" into oc-dr1-dev-plus-aosp
Bryce Lee [Wed, 5 Jul 2017 23:26:45 +0000 (23:26 +0000)]
Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev
Android Build Merger (Role) [Wed, 5 Jul 2017 23:26:37 +0000 (23:26 +0000)]
Merge "Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
4e4b5a2426" into oc-dev-plus-aosp am:
81d0134a0f" into oc-dr1-dev-plus-aosp
Tobias Thierer [Wed, 5 Jul 2017 23:25:01 +0000 (23:25 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
4e4b5a2426" into oc-dev-plus-aosp
am:
81d0134a0f
Change-Id: Ic822925ada8cacab55b9f6d21b57d740ef7154ff
Tobias Thierer [Wed, 5 Jul 2017 23:24:06 +0000 (23:24 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
4e4b5a2426" into oc-dev-plus-aosp
am:
81d0134a0f
Change-Id: I4a19300a18aea12251258e47c935ade2ee485684
Android Build Merger (Role) [Wed, 5 Jul 2017 23:23:54 +0000 (23:23 +0000)]
Merge "Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp am:
6a9d07ed22" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 5 Jul 2017 23:23:27 +0000 (23:23 +0000)]
Merge "Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp am:
6a9d07ed22" into oc-dr1-dev-plus-aosp
Tobias Thierer [Wed, 5 Jul 2017 23:21:42 +0000 (23:21 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp
am:
6a9d07ed22
Change-Id: I3f9a021df549f65b1bc34a5486a62f673ab85d80
Tobias Thierer [Wed, 5 Jul 2017 23:19:19 +0000 (23:19 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp
am:
6a9d07ed22
Change-Id: Icb419aea058ee777bae57217e2be699890f936f3