OSDN Git Service
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
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
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
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
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
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
TreeHugger Robot [Thu, 6 Jul 2017 00:50:26 +0000 (00:50 +0000)]
Merge "Allow timed wakelocks to be released gracefully."
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:48:24 +0000 (00:48 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface" am:
36904fbc94
am:
5ba953cbe9
Change-Id: I87dbd0a8840e57c7959a935e17654a3a4e1b3edf
TreeHugger Robot [Thu, 6 Jul 2017 00:46:25 +0000 (00:46 +0000)]
Merge "Log Bundle statistics when too large."
TreeHugger Robot [Thu, 6 Jul 2017 00:42:09 +0000 (00:42 +0000)]
Merge "Stop tracking user specific uid cpu time on user stop"
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:32:37 +0000 (00:32 +0000)]
Merge "Added -g option"
Treehugger Robot [Thu, 6 Jul 2017 00:31:44 +0000 (00:31 +0000)]
Merge "Better logging infrastructure in OffloadHardwareInterface"
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"
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"
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
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"
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
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"
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
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
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"
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"
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
Tobias Thierer [Thu, 6 Jul 2017 00:08:01 +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: I634bd0a95157d711e79a8e633184096a136617fc
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"
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"
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
Tobias Thierer [Thu, 6 Jul 2017 00:04:00 +0000 (00:04 +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: Iab2cc203c11670e83546f268d37454cce41bcc79
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"
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"
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
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"
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
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
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"
Tobias Thierer [Wed, 5 Jul 2017 23:53:58 +0000 (23:53 +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: I9fb6e8ab13f20a17e65e20cef1e8e7824b319fa9
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"
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
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"
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
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"
TreeHugger Robot [Wed, 5 Jul 2017 23:45:24 +0000 (23:45 +0000)]
Merge "Fix RTL issue in RelativeLayout"
Tobias Thierer [Wed, 5 Jul 2017 23:44:20 +0000 (23:44 +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:
d44c1a7d13
Change-Id: I2caf9a53291b29ad995da5084358c3bbcbb6bff1
Android Build Merger (Role) [Wed, 5 Jul 2017 23:43:30 +0000 (23:43 +0000)]
Merge "Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03" into oc-dev-plus-aosp am:
8bbf3cad1e" into oc-dr1-dev-plus-aosp am:
968333fb8f"
Andreas Gampe [Wed, 5 Jul 2017 23:42:14 +0000 (23:42 +0000)]
Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03" into oc-dev-plus-aosp am:
8bbf3cad1e" into oc-dr1-dev-plus-aosp
am:
968333fb8f
Change-Id: I2fbe0c326e766f80d33d224d176c87160efed0c8
Android Build Merger (Role) [Wed, 5 Jul 2017 23:41:15 +0000 (23:41 +0000)]
Merge "Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03" into oc-dev-plus-aosp am:
8bbf3cad1e" into oc-dr1-dev-plus-aosp am:
bc4d25986e"
Android Build Merger (Role) [Wed, 5 Jul 2017 23:40:37 +0000 (23:40 +0000)]
Merge "Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03" into oc-dev-plus-aosp am:
8bbf3cad1e" into oc-dr1-dev-plus-aosp am:
bc4d25986e"
Andreas Gampe [Wed, 5 Jul 2017 23:39:10 +0000 (23:39 +0000)]
Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03" into oc-dev-plus-aosp am:
8bbf3cad1e" into oc-dr1-dev-plus-aosp
am:
bc4d25986e
Change-Id: I43672252bae50791e06eb12bcfad621550668ac6
Andreas Gampe [Wed, 5 Jul 2017 23:39:01 +0000 (23:39 +0000)]
Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03" into oc-dev-plus-aosp am:
8bbf3cad1e" into oc-dr1-dev-plus-aosp
am:
bc4d25986e
Change-Id: Ia9230daad778410580d9c91198caf94bba96149b
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
Android Build Merger (Role) [Wed, 5 Jul 2017 23:38:26 +0000 (23:38 +0000)]
Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03 am:
a94db9f04d" into oc-dr1-dev-plus-aosp am:
be2860699b"
Android Build Merger (Role) [Wed, 5 Jul 2017 23:38:02 +0000 (23:38 +0000)]
Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03 am:
a94db9f04d" into oc-dr1-dev-plus-aosp am:
be2860699b"
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
Andreas Gampe [Wed, 5 Jul 2017 23:35:57 +0000 (23:35 +0000)]
Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03 am:
a94db9f04d" into oc-dr1-dev-plus-aosp
am:
be2860699b
Change-Id: Id80ac4a52a0a288514207f22990eb8d627625f4a
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
Andreas Gampe [Wed, 5 Jul 2017 23:35:40 +0000 (23:35 +0000)]
Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03 am:
a94db9f04d" into oc-dr1-dev-plus-aosp
am:
be2860699b
Change-Id: I8fc97c1009a1daa3a22efda6c4f60f60e164c208
Android Build Merger (Role) [Wed, 5 Jul 2017 23:34:51 +0000 (23:34 +0000)]
Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03 am:
a94db9f04d am:
3afbfa708a"
Android Build Merger (Role) [Wed, 5 Jul 2017 23:34:42 +0000 (23:34 +0000)]
Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03 am:
a94db9f04d am:
3afbfa708a"
Andreas Gampe [Wed, 5 Jul 2017 23:33:22 +0000 (23:33 +0000)]
Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03 am:
a94db9f04d
am:
3afbfa708a
Change-Id: I2eb068104418f26bba5d414f52487667dce21729
Andreas Gampe [Wed, 5 Jul 2017 23:30:28 +0000 (23:30 +0000)]
Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03 am:
a94db9f04d
am:
3afbfa708a
Change-Id: Iae79a5411d6f0a466f16b2a3d20ecb94292cb1f4
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
Android Build Merger (Role) [Wed, 5 Jul 2017 23:30:03 +0000 (23:30 +0000)]
Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56 am:
f70270f94a" into oc-dev-plus-aosp am:
3255899bbd" into oc-dr1-dev-plus-aosp am:
2cc4474260"
Android Build Merger (Role) [Wed, 5 Jul 2017 23:28:42 +0000 (23:28 +0000)]
Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56 am:
f70270f94a" into oc-dev-plus-aosp am:
3255899bbd" into oc-dr1-dev-plus-aosp am:
2cc4474260"
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
Andreas Gampe [Wed, 5 Jul 2017 23:27:47 +0000 (23:27 +0000)]
Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56 am:
f70270f94a" into oc-dev-plus-aosp am:
3255899bbd" into oc-dr1-dev-plus-aosp
am:
2cc4474260
Change-Id: I9ac2f2b6a5b6b9b37ab086b84e526b1cff4ca577
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
Android Build Merger (Role) [Wed, 5 Jul 2017 23:27:08 +0000 (23:27 +0000)]
Merge "Merge "Merge "Add a convenience method to facilitate tests" into oc-dr1-dev am:
7a4157d7b4" into oc-dr1-dev-plus-aosp am:
fb68c413e5"
Andreas Gampe [Wed, 5 Jul 2017 23:26:49 +0000 (23:26 +0000)]
Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56 am:
f70270f94a" into oc-dev-plus-aosp am:
3255899bbd" into oc-dr1-dev-plus-aosp
am:
2cc4474260
Change-Id: I9be5ed8d3b4f9f90d37e4fd98d664e99dcf2c1fd
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
TreeHugger Robot [Wed, 5 Jul 2017 23:26:26 +0000 (23:26 +0000)]
Merge "Split out jank data from policy"
Android Build Merger (Role) [Wed, 5 Jul 2017 23:26:04 +0000 (23:26 +0000)]
Merge "Merge "Merge "Add a convenience method to facilitate tests" into oc-dr1-dev am:
7a4157d7b4" into oc-dr1-dev-plus-aosp am:
fb68c413e5"
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
Antony Sargent [Wed, 5 Jul 2017 23:24:33 +0000 (23:24 +0000)]
Merge "Merge "Add a convenience method to facilitate tests" into oc-dr1-dev am:
7a4157d7b4" into oc-dr1-dev-plus-aosp
am:
fb68c413e5
Change-Id: I55acebc58fc7e754a37fb5f62cd41f05f27656bd
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:30 +0000 (23:23 +0000)]
Merge "Merge "Merge "Add a convenience method to facilitate tests" into oc-dr1-dev am:
7a4157d7b4" into oc-dr1-dev-plus-aosp am:
f8aabcf6c8"
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
Antony Sargent [Wed, 5 Jul 2017 23:23:27 +0000 (23:23 +0000)]
Merge "Merge "Add a convenience method to facilitate tests" into oc-dr1-dev am:
7a4157d7b4" into oc-dr1-dev-plus-aosp
am:
fb68c413e5
Change-Id: If35cc428ba5173b7b7ec56aed5a6c9910b41d2ff
Android Build Merger (Role) [Wed, 5 Jul 2017 23:22:01 +0000 (23:22 +0000)]
Merge "Merge "Merge "Add a convenience method to facilitate tests" into oc-dr1-dev am:
7a4157d7b4" into oc-dr1-dev-plus-aosp am:
f8aabcf6c8"
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
Antony Sargent [Wed, 5 Jul 2017 23:19:13 +0000 (23:19 +0000)]
Merge "Merge "Add a convenience method to facilitate tests" into oc-dr1-dev am:
7a4157d7b4" into oc-dr1-dev-plus-aosp
am:
f8aabcf6c8
Change-Id: Id7d5528c5b077dc20a57124d9383a2803da95075
Android Build Merger (Role) [Wed, 5 Jul 2017 23:16:00 +0000 (23:16 +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
Android Build Merger (Role) [Wed, 5 Jul 2017 23:15:57 +0000 (23:15 +0000)]
Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56 am:
f70270f94a am:
f3ee8c601a am:
22be453293"
Antony Sargent [Wed, 5 Jul 2017 23:15:44 +0000 (23:15 +0000)]
Merge "Merge "Add a convenience method to facilitate tests" into oc-dr1-dev am:
7a4157d7b4" into oc-dr1-dev-plus-aosp
am:
f8aabcf6c8
Change-Id: I2fb364d7eaa6f155fa30dd2d04f1de3877e2cb56
Android Build Merger (Role) [Wed, 5 Jul 2017 23:14:40 +0000 (23:14 +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
Andreas Gampe [Wed, 5 Jul 2017 23:13:55 +0000 (23:13 +0000)]
Merge "Framework: Add libziparchive dependency" am:
2688a9ab56 am:
f70270f94a am:
f3ee8c601a
am:
22be453293
Change-Id: I2d5e0e37a9dc3a4cb1639fcc86cca9d2820dd7e7
Tobias Thierer [Wed, 5 Jul 2017 23:12:39 +0000 (23:12 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp
am:
d01571b951
Change-Id: I1c0091643eecf0794bc515ba65935eec523be585
Tobias Thierer [Wed, 5 Jul 2017 23:09:23 +0000 (23:09 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp
am:
d01571b951
Change-Id: I50aa3812696208517848869ee646f272290d6275
Andreas Gampe [Wed, 5 Jul 2017 23:09:21 +0000 (23:09 +0000)]
Merge "Framework: Add libziparchive dependency" am:
2688a9ab56 am:
f70270f94a am:
f3ee8c601a
am:
22be453293
Change-Id: I8e02c61c6838262f71de75a3aad47be37c8d5cb3
Android Build Merger (Role) [Wed, 5 Jul 2017 23:08:55 +0000 (23:08 +0000)]
Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03" into oc-dev-plus-aosp am:
8bbf3cad1e" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 5 Jul 2017 23:08:32 +0000 (23:08 +0000)]
Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03" into oc-dev-plus-aosp am:
8bbf3cad1e" into oc-dr1-dev-plus-aosp
Andreas Gampe [Wed, 5 Jul 2017 23:07:04 +0000 (23:07 +0000)]
Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03" into oc-dev-plus-aosp
am:
8bbf3cad1e
Change-Id: I37f71e0dd4a12cac9d099fc9a8c000603e167478