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

Hiroki Yamamoto [Thu, 6 Jul 2017 02:15:35 +0000 (02:15 +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
am: e3053f33d8

Change-Id: I87fed8dc4ad07c785966ea45557b5de3c1a358b6

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 02:13:21 +0000 (02:13 +0000)]

Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc am: 1a6d0d753e" into oc-dev-plus-aosp am: 808ae634dd am: 75fd97e073"

commit | commitdiff | tree

Hiroki Yamamoto [Thu, 6 Jul 2017 02:12:01 +0000 (02:12 +0000)]

Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc am: 1a6d0d753e" into oc-dev-plus-aosp am: 808ae634dd
am: 75fd97e073

Change-Id: I11d87a5775f0d0e3bdd35378c9b3c18b9ea089a1

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 02:11:07 +0000 (02:11 +0000)]

Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc am: 1a6d0d753e am: 3ccfa35667" into oc-dr1-dev-plus-aosp am: c8953e6edf"

commit | commitdiff | tree

Hiroki Yamamoto [Thu, 6 Jul 2017 02:09:54 +0000 (02:09 +0000)]

Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc am: 1a6d0d753e am: 3ccfa35667" into oc-dr1-dev-plus-aosp
am: c8953e6edf

Change-Id: Id5b5cca201333e6e97099c5468e4f183d774f957

commit | commitdiff | tree

Hiroki Yamamoto [Thu, 6 Jul 2017 02:08:14 +0000 (02:08 +0000)]

commit | commitdiff | tree

Hiroki Yamamoto [Thu, 6 Jul 2017 02:06:46 +0000 (02:06 +0000)]

Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc am: 1a6d0d753e am: 3ccfa35667
am: 5dd3f8fa85

Change-Id: I7f0c921227028ba27fda062da8e47989d0ef71b5

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 02:02:21 +0000 (02:02 +0000)]

Merge changes from topic 'hackbod_completion'

* changes:
Fix issue #63095854: adb shell cmd jobscheduler timeout reports...
Add reporting of how jobs complete.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 01:30:53 +0000 (01:30 +0000)]

Merge "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 am: bb8568d903 -s ours"

commit | commitdiff | tree

Treehugger Robot [Thu, 6 Jul 2017 01:30:10 +0000 (01:30 +0000)]

Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover"

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 01:29:22 +0000 (01:29 +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
am: bb8568d903 -s ours

Change-Id: I0dc49bb82c746b829fe0adede37852c60d612395

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 01:28:26 +0000 (01:28 +0000)]

Merge "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 am: 8cb1927666 -s ours"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 01:28:05 +0000 (01:28 +0000)]

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 01:27:04 +0000 (01:27 +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
am: 8cb1927666 -s ours

Change-Id: I5fb2cadcf585687a3c3d3d0f6ba5b3fc035803db

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 01:27:00 +0000 (01:27 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 01:26:24 +0000 (01:26 +0000)]

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 01:24:59 +0000 (01:24 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 01:24:09 +0000 (01:24 +0000)]

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 01:22:31 +0000 (01:22 +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
am: ba48fd4828 -s ours

Change-Id: If3d0c2f97fbc86fa1489891c9d208d1462d41bad

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 01:21:30 +0000 (01:21 +0000)]

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 01:19:47 +0000 (01:19 +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
am: 3626feb156 -s ours

Change-Id: I3dee6ee094a01187bf2c83dc45cf09e7ea4ba9ec

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 01:18:31 +0000 (01:18 +0000)]

Merge "Merge "Merge "Update the smearing methods in framework." into oc-dr1-dev am: 386d8133c4" into oc-dr1-dev-plus-aosp am: d2fe259c4e"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 01:17:53 +0000 (01:17 +0000)]

commit | commitdiff | tree

jackqdyulei [Thu, 6 Jul 2017 01:16:23 +0000 (01:16 +0000)]

Merge "Merge "Update the smearing methods in framework." into oc-dr1-dev am: 386d8133c4" into oc-dr1-dev-plus-aosp
am: d2fe259c4e

Change-Id: I5ad966202a2e1f4a2bbe73d4e9a160d19219198d

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 01:16:00 +0000 (01:16 +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
am: 3626feb156 -s ours

Change-Id: I631e18472b9970271b43a308fc6e86bdc8905747

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 01:15:14 +0000 (01:15 +0000)]

Merge "Merge "Update the smearing methods in framework." into oc-dr1-dev am: 386d8133c4 am: 8f386f6e24"

commit | commitdiff | tree

jackqdyulei [Thu, 6 Jul 2017 01:13:58 +0000 (01:13 +0000)]

Merge "Update the smearing methods in framework." into oc-dr1-dev am: 386d8133c4
am: 8f386f6e24

Change-Id: Id2162eb0711c47ce072c129afdf239c736f4c138

commit | commitdiff | tree

jackqdyulei [Thu, 6 Jul 2017 01:13:41 +0000 (01:13 +0000)]

Merge "Merge "Update the smearing methods in framework." into oc-dr1-dev am: 386d8133c4" into oc-dr1-dev-plus-aosp
am: d2fe259c4e

Change-Id: Iec085f3619e97c8c05681867a9323b038f8b7531

commit | commitdiff | tree

jackqdyulei [Thu, 6 Jul 2017 01:11:45 +0000 (01:11 +0000)]

Merge "Update the smearing methods in framework." into oc-dr1-dev am: 386d8133c4
am: 8f386f6e24

Change-Id: Iaee832c78d18de4b592af672bb9da28b34b1fd5e

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 01:08:40 +0000 (01:08 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 01:05:08 +0000 (01:05 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 01:04:24 +0000 (01:04 +0000)]

Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 am: 5ba953cbe9 am: 8c72e188f2 -s ours" into oc-dr1-dev-plus-aosp
am: 4cbb47fc93 -s ours

Change-Id: Ibb48cdd0384f4a8eac33306d513c36fe2a40326d

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 01:03:51 +0000 (01:03 +0000)]

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 01:02:42 +0000 (01:02 +0000)]

Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 am: 5ba953cbe9 am: 8c72e188f2 -s ours
am: 499ef2ced8 -s ours

Change-Id: Ic57560801d53403e25d6547214e46862b232a0f0

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 00:50:26 +0000 (00:50 +0000)]

Merge "Allow timed wakelocks to be released gracefully."

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 00:49:56 +0000 (00:49 +0000)]

Merge "Update the smearing methods in framework." into oc-dr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 00:46:25 +0000 (00:46 +0000)]

Merge "Log Bundle statistics when too large."

commit | commitdiff | tree

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

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 00:42:14 +0000 (00:42 +0000)]

Merge "Better logging infrastructure in OffloadHardwareInterface"
am: 36904fbc94

Change-Id: I7789242c6f574c1d81eb0a5e9527b167d4b3c755

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 00:42:09 +0000 (00:42 +0000)]

Merge "Stop tracking user specific uid cpu time on user stop"

commit | commitdiff | tree

Erik Kline [Thu, 6 Jul 2017 00:41:33 +0000 (00:41 +0000)]

Merge "Better logging infrastructure in OffloadHardwareInterface"
am: 36904fbc94

Change-Id: Iea47f74dc77b347343726d2ab0ee128e5391767b

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 00:32:37 +0000 (00:32 +0000)]

Merge "Added -g option"

commit | commitdiff | tree

Treehugger Robot [Thu, 6 Jul 2017 00:31:44 +0000 (00:31 +0000)]

Merge "Better logging infrastructure in OffloadHardwareInterface"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 00:16:53 +0000 (00:16 +0000)]

Merge "Merge "Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am: 484d742af0" into oc-dr1-dev-plus-aosp am: faf101f24c"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 00:15:42 +0000 (00:15 +0000)]

Merge "Merge "Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am: 484d742af0" into oc-dr1-dev-plus-aosp am: faf101f24c"

commit | commitdiff | tree

Bryce Lee [Thu, 6 Jul 2017 00:15:13 +0000 (00:15 +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
am: faf101f24c

Change-Id: I353d79ca06c15c0ef1ea7df6b3320097afbdc4cf

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 00:14:50 +0000 (00:14 +0000)]

Merge "Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am: 484d742af0 am: 6ca5e16be3"

commit | commitdiff | tree

Bryce Lee [Thu, 6 Jul 2017 00:14:15 +0000 (00:14 +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
am: faf101f24c

Change-Id: I0c9fb28f661b6f39e5a6240943392e4f98b98439

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 00:13:51 +0000 (00:13 +0000)]

Merge "Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am: 484d742af0 am: 6ca5e16be3"

commit | commitdiff | tree

Bryce Lee [Thu, 6 Jul 2017 00:12:36 +0000 (00:12 +0000)]

Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am: 484d742af0
am: 6ca5e16be3

Change-Id: Id7aa1264e0bb60940e40a6e3280df8583e80ed75

commit | commitdiff | tree

Bryce Lee [Thu, 6 Jul 2017 00:12:12 +0000 (00:12 +0000)]

Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am: 484d742af0
am: 6ca5e16be3

Change-Id: I55ab2a2736953b474032e100eb3314e2ca0b0b21

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 00:12:09 +0000 (00:12 +0000)]

Merge "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 am: 45ff9d8c29"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 00:11:03 +0000 (00:11 +0000)]

Merge "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 am: 45ff9d8c29"

commit | commitdiff | tree

Tobias Thierer [Thu, 6 Jul 2017 00:08:54 +0000 (00:08 +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
am: 45ff9d8c29

Change-Id: Ibb54850e5f8e1882b748a0646f443aab67fc40ff

commit | commitdiff | tree

Tobias Thierer [Thu, 6 Jul 2017 00:08:01 +0000 (00:08 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 00:07:36 +0000 (00:07 +0000)]

Merge "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 am: bbaeb7a782"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 00:07:01 +0000 (00:07 +0000)]

Merge "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 am: bbaeb7a782"

commit | commitdiff | tree

Tobias Thierer [Thu, 6 Jul 2017 00:05:12 +0000 (00:05 +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
am: bbaeb7a782

Change-Id: I9493cb869ae5752f286bca7bfa4a9a9bc936ce8d

commit | commitdiff | tree

Tobias Thierer [Thu, 6 Jul 2017 00:04:00 +0000 (00:04 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 00:02:53 +0000 (00:02 +0000)]

Merge "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 am: e6d396df1f"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 00:00:23 +0000 (00:00 +0000)]

Merge "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 am: e6d396df1f"

commit | commitdiff | tree

Tobias Thierer [Thu, 6 Jul 2017 00:00:04 +0000 (00:00 +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
am: e6d396df1f

Change-Id: I8d4812fa71155af28856859ab5a50148d7be3a6c

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jul 2017 23:59:22 +0000 (23:59 +0000)]

Merge "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 am: d08fe5a6f9"

commit | commitdiff | tree

Tobias Thierer [Wed, 5 Jul 2017 23:58:02 +0000 (23:58 +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
am: e6d396df1f

Change-Id: I3e005febce53df0d71ba26caeec10e61ebcbb2bd

commit | commitdiff | tree

Tobias Thierer [Wed, 5 Jul 2017 23:57:41 +0000 (23:57 +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
am: d08fe5a6f9

Change-Id: I268fb592d78b7fcbbccfccc5aec1e74f4bc7981e

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jul 2017 23:57:23 +0000 (23:57 +0000)]

Merge "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 am: d08fe5a6f9"

commit | commitdiff | tree

Tobias Thierer [Wed, 5 Jul 2017 23:53:58 +0000 (23:53 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jul 2017 23:53:18 +0000 (23:53 +0000)]

Merge "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 am: 4a10a10448"

commit | commitdiff | tree

Tobias Thierer [Wed, 5 Jul 2017 23:50:54 +0000 (23:50 +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
am: 4a10a10448

Change-Id: I03a520b473cb22f62e10db60a5381d66b3d74eaa

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jul 2017 23:50:17 +0000 (23:50 +0000)]

Merge "Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 93cc3d86ad" into oc-dev-plus-aosp am: d01571b951" into oc-dr1-dev-plus-aosp am: 848b0f2a8d"

commit | commitdiff | tree

Tobias Thierer [Wed, 5 Jul 2017 23:47:29 +0000 (23:47 +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: d01571b951" into oc-dr1-dev-plus-aosp
am: 848b0f2a8d

Change-Id: I8cb0ec86c0f40ae325ee1fef8b145967e5ef40b8

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jul 2017 23:46:35 +0000 (23:46 +0000)]

Merge "Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 93cc3d86ad" into oc-dev-plus-aosp am: d01571b951" into oc-dr1-dev-plus-aosp am: d44c1a7d13"

commit | commitdiff | tree

TreeHugger Robot [Wed, 5 Jul 2017 23:45:24 +0000 (23:45 +0000)]