OSDN Git Service
Daniel Nishi [Mon, 19 Jun 2017 18:07:13 +0000 (18:07 +0000)]
Merge "Flag the DH no threshold options menu." into oc-dr1-dev am:
f69d450b6f
am:
5cecfe5b0a
Change-Id: Ibc39e8545525925941c806f35105a73e0cf971f8
Julia Reynolds [Mon, 19 Jun 2017 17:59:00 +0000 (17:59 +0000)]
Merge "Migrate managed services from setting to policy xml"
Daniel Nishi [Mon, 19 Jun 2017 17:55:32 +0000 (17:55 +0000)]
Merge "Flag the DH no threshold options menu." into oc-dr1-dev
am:
f69d450b6f
Change-Id: I44ea7994178ca700555479bd5901779c4639f604
Daniel Nishi [Mon, 19 Jun 2017 17:45:16 +0000 (17:45 +0000)]
Merge "Flag the DH no threshold options menu." into oc-dr1-dev
Dianne Hackborn [Mon, 19 Jun 2017 17:43:38 +0000 (17:43 +0000)]
Merge "Merge "Maybe fix issue #
62199092: Alarm didn't ring, upcoming alarm..." into oc-dev am:
8a95d49d8f am:
a7853c75b8" into oc-dr1-dev-plus-aosp
am:
ccf1479054
Change-Id: Ia9a577a93ae9714e7d4a5048fa509c34c7faa13f
Julia Reynolds [Tue, 6 Jun 2017 20:14:18 +0000 (16:14 -0400)]
Migrate managed services from setting to policy xml
Change-Id: Ie20f91dbdd0ba6b57b5909cbf0152a32754fe02d
Fixes:
62263757
Test: runtest systemui-notification, cts AudioManagerTest,
cts-verifier DND tests, verify bug reports after toggling
access for various types of managed services, verified
default approved services aren't renabled on boot; verified that
they are reenabled after a device reset, verified that
settings are migrated after a restore from OC backup.
TreeHugger Robot [Mon, 19 Jun 2017 17:39:57 +0000 (17:39 +0000)]
Merge "Hide IME when switching to Radial Time Picker"
Dianne Hackborn [Mon, 19 Jun 2017 17:30:55 +0000 (17:30 +0000)]
Merge "Maybe fix issue #
62199092: Alarm didn't ring, upcoming alarm..." into oc-dev am:
8a95d49d8f am:
54c10dca58
am:
8323830495
Change-Id: Ie4fe65681b0fa537288923154f84794dfa779dfc
Siyamed Sinir [Mon, 19 Jun 2017 17:28:04 +0000 (17:28 +0000)]
Merge "Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev am:
58df6ab93f am:
04171ecb31" into oc-dr1-dev-plus-aosp
am:
8e8a88ee0f
Change-Id: Ia2373803193ec498824a2808c3401e64c8301174
Siyamed Sinir [Mon, 19 Jun 2017 17:24:27 +0000 (17:24 +0000)]
Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev am:
58df6ab93f am:
92d86d59c0
am:
4c6d3ba183
Change-Id: I06ed6fea1fe414e7a33694047b0e6e903b7816bb
Android Build Merger (Role) [Mon, 19 Jun 2017 17:21:15 +0000 (17:21 +0000)]
Merge "Merge "Maybe fix issue #
62199092: Alarm didn't ring, upcoming alarm..." into oc-dev am:
8a95d49d8f am:
a7853c75b8" into oc-dr1-dev-plus-aosp
Dianne Hackborn [Mon, 19 Jun 2017 17:19:19 +0000 (17:19 +0000)]
Merge "Maybe fix issue #
62199092: Alarm didn't ring, upcoming alarm..." into oc-dev am:
8a95d49d8f
am:
a7853c75b8
Change-Id: Ifc9d98444bffb923ecbda3d125f50e5a1adf396d
Dianne Hackborn [Mon, 19 Jun 2017 17:18:53 +0000 (17:18 +0000)]
Merge "Maybe fix issue #
62199092: Alarm didn't ring, upcoming alarm..." into oc-dev am:
8a95d49d8f
am:
54c10dca58
Change-Id: Ib4418fa8e1bf1660b622b9015a08a3ea375d2d07
Android Build Merger (Role) [Mon, 19 Jun 2017 17:16:10 +0000 (17:16 +0000)]
Merge "Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev am:
58df6ab93f am:
04171ecb31" into oc-dr1-dev-plus-aosp
Dianne Hackborn [Mon, 19 Jun 2017 17:13:26 +0000 (17:13 +0000)]
Merge "Maybe fix issue #
62199092: Alarm didn't ring, upcoming alarm..." into oc-dev
am:
8a95d49d8f
Change-Id: I2d59709712d96b78e1bd5d634e6c31cc0a0d6ff0
Siyamed Sinir [Mon, 19 Jun 2017 17:13:23 +0000 (17:13 +0000)]
Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev am:
58df6ab93f
am:
92d86d59c0
Change-Id: I690ebf4df8e22a57c5f7b2b5e0267a550db15945
Dianne Hackborn [Mon, 19 Jun 2017 17:13:19 +0000 (17:13 +0000)]
Merge "Maybe fix issue #
62199092: Alarm didn't ring, upcoming alarm..." into oc-dev
am:
8a95d49d8f
Change-Id: I40b069c811b9cc687265f802524b8b290cd4f269
Siyamed Sinir [Mon, 19 Jun 2017 17:13:19 +0000 (17:13 +0000)]
Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev am:
58df6ab93f
am:
04171ecb31
Change-Id: I3306e0fd1a7fdf211e330c0a53787f9b1eb5ef1c
Siyamed Sinir [Mon, 19 Jun 2017 17:05:27 +0000 (17:05 +0000)]
Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev
am:
58df6ab93f
Change-Id: Ic6b3aa97edffd87e643a778d73aa61e890f52a4b
Dianne Hackborn [Mon, 19 Jun 2017 17:04:04 +0000 (17:04 +0000)]
Merge "Maybe fix issue #
62199092: Alarm didn't ring, upcoming alarm..." into oc-dev
Siyamed Sinir [Mon, 19 Jun 2017 17:03:17 +0000 (17:03 +0000)]
Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev
am:
58df6ab93f
Change-Id: Icd240aa9e5881067acd7521e4235692c5a538b29
TreeHugger Robot [Mon, 19 Jun 2017 16:58:05 +0000 (16:58 +0000)]
Merge "Add periodic sync support to requestsync."
Siyamed Sinir [Mon, 19 Jun 2017 16:53:11 +0000 (16:53 +0000)]
Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev
Jason Monk [Mon, 19 Jun 2017 15:56:45 +0000 (15:56 +0000)]
Merge "Merge "Fix flash of ambient on fp unlock" into oc-dev am:
c885c24e10 am:
31c2f1e881" into oc-dr1-dev-plus-aosp
am:
a24fdfd317
Change-Id: I5bc39949909385bd87cfffeb70a5df2e55054589
Jason Monk [Mon, 19 Jun 2017 15:54:20 +0000 (15:54 +0000)]
Merge "Fix flash of ambient on fp unlock" into oc-dev am:
c885c24e10 am:
1a2133629f
am:
c2b629c61e
Change-Id: Ibf4d518b1292e6768df43d65c71923921448043f
Android Build Merger (Role) [Mon, 19 Jun 2017 15:45:16 +0000 (15:45 +0000)]
Merge "Merge "Fix flash of ambient on fp unlock" into oc-dev am:
c885c24e10 am:
31c2f1e881" into oc-dr1-dev-plus-aosp
Jason Monk [Mon, 19 Jun 2017 15:43:15 +0000 (15:43 +0000)]
Merge "Fix flash of ambient on fp unlock" into oc-dev am:
c885c24e10
am:
31c2f1e881
Change-Id: Icd1e169bb9538e1ac778469393f4a3be7880368b
Jason Monk [Mon, 19 Jun 2017 15:43:14 +0000 (15:43 +0000)]
Merge "Fix flash of ambient on fp unlock" into oc-dev am:
c885c24e10
am:
1a2133629f
Change-Id: I6f3514154e75a74c69bdf5292dc73783e652a9ec
Jason Monk [Mon, 19 Jun 2017 15:33:21 +0000 (15:33 +0000)]
Merge "Fix flash of ambient on fp unlock" into oc-dev
am:
c885c24e10
Change-Id: Ibbff840983dc3f15745275d44393645f110b74c1
Jason Monk [Mon, 19 Jun 2017 15:33:12 +0000 (15:33 +0000)]
Merge "Fix flash of ambient on fp unlock" into oc-dev
am:
c885c24e10
Change-Id: I70a913e7743e79e90e3d5c1e8bbcb8e6a4071193
TreeHugger Robot [Mon, 19 Jun 2017 15:26:11 +0000 (15:26 +0000)]
Merge "Fix flash of ambient on fp unlock" into oc-dev
Erik Kline [Mon, 19 Jun 2017 13:48:11 +0000 (13:48 +0000)]
Merge "Make interface IP serving code set LinkProperties" am:
1dae9a4709 am:
9461f78541 am:
5219f643dd
am:
576d67b453
Change-Id: I8b15edbf04c10cd9429da079c6b79352a6740b3b
Erik Kline [Mon, 19 Jun 2017 13:37:15 +0000 (13:37 +0000)]
Merge "Make interface IP serving code set LinkProperties" am:
1dae9a4709 am:
9461f78541
am:
5219f643dd
Change-Id: I39a1744a7fa9b91e3b607429c79f39578e9bde19
Erik Kline [Mon, 19 Jun 2017 13:26:13 +0000 (13:26 +0000)]
Merge "Make interface IP serving code set LinkProperties" am:
1dae9a4709
am:
9461f78541
Change-Id: I753ab701f2109c0972816724e73119dc1dbc4dca
Erik Kline [Mon, 19 Jun 2017 13:15:02 +0000 (13:15 +0000)]
Merge "Make interface IP serving code set LinkProperties"
am:
1dae9a4709
Change-Id: I84e4b3fb0be210f59eb663597a6c81c95d3e51d6
Treehugger Robot [Mon, 19 Jun 2017 13:00:34 +0000 (13:00 +0000)]
Merge "Make interface IP serving code set LinkProperties"
Alessio Balsini [Mon, 19 Jun 2017 12:15:41 +0000 (12:15 +0000)]
Merge "Documentation: changed tid parameter description for getThreadPriority()" am:
663b02dd28 am:
6f0adbfaea am:
fd88d146b4
am:
537782f395
Change-Id: I38896f0929aabf60444882a79cda6ae8290763f3
Alessio Balsini [Mon, 19 Jun 2017 12:04:37 +0000 (12:04 +0000)]
Merge "Documentation: changed tid parameter description for getThreadPriority()" am:
663b02dd28 am:
6f0adbfaea
am:
fd88d146b4
Change-Id: Iab127e59a59c959e9cd100dff68f415415b0bcce
Alessio Balsini [Mon, 19 Jun 2017 11:54:05 +0000 (11:54 +0000)]
Merge "Documentation: changed tid parameter description for getThreadPriority()" am:
663b02dd28
am:
6f0adbfaea
Change-Id: I0626fb2d9de978f204ba9898a56e4225a71f03e8
Alessio Balsini [Mon, 19 Jun 2017 11:43:00 +0000 (11:43 +0000)]
Merge "Documentation: changed tid parameter description for getThreadPriority()"
am:
663b02dd28
Change-Id: I4953cf4bf4af592e080114bf937453b84b4a3e4e
Treehugger Robot [Mon, 19 Jun 2017 11:29:58 +0000 (11:29 +0000)]
Merge "Documentation: changed tid parameter description for getThreadPriority()"
Erik Kline [Mon, 19 Jun 2017 08:50:49 +0000 (08:50 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" into oc-dr1-dev am:
7284e2a88b -s ours
am:
6d50b1aefc -s ours
Change-Id: I9e7d7dfdd09a31018421ed904da5665ff526ca3f
Alessio Balsini [Wed, 7 Jun 2017 09:41:33 +0000 (11:41 +0200)]
Documentation: changed tid parameter description for getThreadPriority()
Wrong description of the "tid" parameter used by getThreadPriority():
the function does not "change" the priority of the thread associated to
"tid".
Defined also the meaning of setting tid parameter to 0.
Test: None
Change-Id: I8552f3b110eaab1aefa51477e82d3e295547be34
Signed-off-by: Alessio Balsini <alessio.balsini@gmail.com>
Erik Kline [Mon, 19 Jun 2017 08:40:21 +0000 (08:40 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" into oc-dr1-dev
am:
7284e2a88b -s ours
Change-Id: I90181d2ce6f3c5f65110aa53ae81e657d9894fcd
TreeHugger Robot [Mon, 19 Jun 2017 08:31:31 +0000 (08:31 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" into oc-dr1-dev
Erik Kline [Mon, 12 Jun 2017 09:20:08 +0000 (18:20 +0900)]
Make interface IP serving code set LinkProperties
Additionally, clean up awkward IPv6TetheringInterfaceServices
instantiation mechanics. In future, this class will be absorbed
by TetherInterfaceStateMachine (prior to its renaming to IpServer).
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Change-Id: Ib620e3df182f9f8e2c019aae1cd8981eb0b29376
Zhijun He [Mon, 19 Jun 2017 05:14:31 +0000 (05:14 +0000)]
Merge "Camera2: copy user tag to HFR request list" into oc-dr1-dev am:
a34c04d5c3
am:
71e07faafb
Change-Id: I5fad04f7a8e3f2f2ba19204e19d41e256b6a1a6e
Zhijun He [Mon, 19 Jun 2017 05:04:29 +0000 (05:04 +0000)]
Merge "Camera2: copy user tag to HFR request list" into oc-dr1-dev
am:
a34c04d5c3
Change-Id: Ie7fbfc6948f19c36a487defffa4ca0a10e8eae66
TreeHugger Robot [Mon, 19 Jun 2017 04:56:51 +0000 (04:56 +0000)]
Merge "Camera2: copy user tag to HFR request list" into oc-dr1-dev
Ying Xu [Mon, 19 Jun 2017 04:49:29 +0000 (04:49 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" into oc-dr1-dev am:
38529959bf -s ours
am:
008bc4f265 -s ours
Change-Id: I41e60974e787e66d56a70e8349e1d1c8ad05db90
Ying Xu [Mon, 19 Jun 2017 04:39:04 +0000 (04:39 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" into oc-dr1-dev
am:
38529959bf -s ours
Change-Id: Ie44630dcc12ad16e326c70a6633e509bcf7012ff
Ying Xu [Mon, 19 Jun 2017 04:30:23 +0000 (04:30 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" into oc-dr1-dev
Zhijun He [Sun, 18 Jun 2017 23:21:51 +0000 (16:21 -0700)]
Camera2: copy user tag to HFR request list
User tag is not part of native metadata, and need carry over explicitly.
Test: Camera CTS
Bug:
33761753
Change-Id: Ic58783fc204ce71e073f71d0fa50d4d961f4e7ce
Todd Kennedy [Sun, 18 Jun 2017 17:36:12 +0000 (17:36 +0000)]
Merge "Merge "Track both framework and app overlays per package" into oc-dev am:
65ffdba7f7 am:
895b695ab0" into oc-dr1-dev-plus-aosp
am:
80c75595b8
Change-Id: Ic303e2a8cd2ee5362f3879993764a561adcb21a5
Todd Kennedy [Sun, 18 Jun 2017 17:33:17 +0000 (17:33 +0000)]
Merge "Track both framework and app overlays per package" into oc-dev am:
65ffdba7f7 am:
c36175d754
am:
6cfafd4c7b
Change-Id: Ia8e8b2b45c55879b212ca2a7dbf8b5b6dbfa0b5b
Android Build Merger (Role) [Sun, 18 Jun 2017 17:26:19 +0000 (17:26 +0000)]
Merge "Merge "Track both framework and app overlays per package" into oc-dev am:
65ffdba7f7 am:
895b695ab0" into oc-dr1-dev-plus-aosp
Todd Kennedy [Sun, 18 Jun 2017 17:24:09 +0000 (17:24 +0000)]
Merge "Track both framework and app overlays per package" into oc-dev am:
65ffdba7f7
am:
c36175d754
Change-Id: I74774dac4da9a9f270f3ca66780664c82a1a3c05
Todd Kennedy [Sun, 18 Jun 2017 17:24:07 +0000 (17:24 +0000)]
Merge "Track both framework and app overlays per package" into oc-dev am:
65ffdba7f7
am:
895b695ab0
Change-Id: I158aeb4a8327454a067310c7ba51c8487ada5c8d
Todd Kennedy [Sun, 18 Jun 2017 17:15:12 +0000 (17:15 +0000)]
Merge "Track both framework and app overlays per package" into oc-dev
am:
65ffdba7f7
Change-Id: I4af23140f4d9ecc2c1e9faa09d03eddb22db9dae
Todd Kennedy [Sun, 18 Jun 2017 17:15:07 +0000 (17:15 +0000)]
Merge "Track both framework and app overlays per package" into oc-dev
am:
65ffdba7f7
Change-Id: Ib58b5ed03daa375c0ba667829d4a38567c99ac78
Todd Kennedy [Sun, 18 Jun 2017 17:06:17 +0000 (17:06 +0000)]
Merge "Track both framework and app overlays per package" into oc-dev
Eric Laurent [Sun, 18 Jun 2017 05:36:46 +0000 (05:36 +0000)]
Merge "AudioService: implement safe volume warning for USB Headsets" into oc-dr1-dev am:
95b41415cd
am:
997de13c3e
Change-Id: I01de23e744fcf7925ae8555b1a2eb0ded999c7be
Eric Laurent [Sun, 18 Jun 2017 05:24:33 +0000 (05:24 +0000)]
Merge "AudioService: implement safe volume warning for USB Headsets" into oc-dr1-dev
am:
95b41415cd
Change-Id: Ib0b79a1526c32fcd7c4cc253feac77ba0f4d3bae
TreeHugger Robot [Sun, 18 Jun 2017 05:15:31 +0000 (05:15 +0000)]
Merge "AudioService: implement safe volume warning for USB Headsets" into oc-dr1-dev
Lucas Dupin [Sat, 17 Jun 2017 17:33:26 +0000 (17:33 +0000)]
Merge "K-Means color clustering" into oc-dr1-dev am:
11cc260047
am:
af26f72fb8
Change-Id: I1985de652f8d4643a8a5a170fd7f43c33c6c0bd7
Lucas Dupin [Sat, 17 Jun 2017 17:26:20 +0000 (17:26 +0000)]
Merge "K-Means color clustering" into oc-dr1-dev
am:
11cc260047
Change-Id: If99425cb57a322900f476227932cdcadd85abf00
Lucas Dupin [Sat, 17 Jun 2017 17:20:59 +0000 (17:20 +0000)]
Merge "K-Means color clustering" into oc-dr1-dev
Bill Yi [Sat, 17 Jun 2017 11:45:53 +0000 (11:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
3a759c93b8 -s ours
am:
96e57619af -s ours
Change-Id: I3c25e7aab9fcc9a242353034d1ca5f2d8adc637e
Bill Yi [Sat, 17 Jun 2017 11:36:22 +0000 (11:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
3a759c93b8 -s ours
Change-Id: Ib4197d83ce8733ae25f2a091d9622dc47205817f
TreeHugger Robot [Sat, 17 Jun 2017 11:29:10 +0000 (11:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 17 Jun 2017 06:31:17 +0000 (06:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
767d02158e -s ours
am:
babf652e62 -s ours
Change-Id: Id3d4b5975af01667887dbbf855638aa076cd0a5c
Bill Yi [Sat, 17 Jun 2017 06:23:30 +0000 (06:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
f0bdfbc508 -s ours am:
dee1ecf9df -s ours
am:
74facaef64 -s ours
Change-Id: I3462727e4af8ea67b64316422a02cffed77106de
Bill Yi [Sat, 17 Jun 2017 06:18:54 +0000 (06:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
767d02158e -s ours
Change-Id: I596636ce8d71ce60bb73ef4c95d1df32c0b1d3a0
Bill Yi [Sat, 17 Jun 2017 06:17:21 +0000 (06:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
f0bdfbc508 -s ours am:
c4e253af2a -s ours
am:
7790c15c24 -s ours
Change-Id: I8430e1c917c72992dc77cf32309fbec12940eaa8
Bill Yi [Sat, 17 Jun 2017 06:16:42 +0000 (06:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
f0bdfbc508 -s ours
am:
dee1ecf9df -s ours
Change-Id: I135d93838a61fad0211b23aaf5b3b48ef40926b5
Bill Yi [Sat, 17 Jun 2017 06:12:21 +0000 (06:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
f0bdfbc508 -s ours
am:
c4e253af2a -s ours
Change-Id: Iac7e7529df9031b985b24dea82e4e2fc7735a066
TreeHugger Robot [Sat, 17 Jun 2017 06:10:52 +0000 (06:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 17 Jun 2017 06:08:40 +0000 (06:08 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sat, 17 Jun 2017 06:07:03 +0000 (06:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f0bdfbc508 -s ours
Change-Id: I2d6f99108a1aa2a170aac8d50cc1cf3398223fd2
Bill Yi [Sat, 17 Jun 2017 06:06:58 +0000 (06:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f0bdfbc508 -s ours
Change-Id: I451787702af10fa932a1b5fd256c989ee979ba74
TreeHugger Robot [Sat, 17 Jun 2017 06:02:01 +0000 (06:02 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 17 Jun 2017 05:57:54 +0000 (05:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Sat, 17 Jun 2017 04:22:31 +0000 (21:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6dc3d54f22f40b9079b6a7e55def38409cc48e89
Auto-generated-cl: translation import
Bill Yi [Sat, 17 Jun 2017 03:58:12 +0000 (20:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9637f1630ab23bef3c25b362d522f633c1fd7be3
Auto-generated-cl: translation import
Philip P. Moltmann [Sat, 17 Jun 2017 03:15:08 +0000 (03:15 +0000)]
Merge "Merge "Only preload selected pages" into oc-dev am:
314457a424 am:
4116849cfb" into oc-dr1-dev-plus-aosp
am:
fff2b690ca
Change-Id: I676f274fb034b1a167003f7e7e8cef7deadf2d72
Philip P. Moltmann [Sat, 17 Jun 2017 03:09:25 +0000 (03:09 +0000)]
Merge "Only preload selected pages" into oc-dev am:
314457a424 am:
1af7c0bdbe
am:
39ef047a93
Change-Id: I23d064676ba55ab98946d136dfbf8df635f2309f
Android Build Merger (Role) [Sat, 17 Jun 2017 03:05:09 +0000 (03:05 +0000)]
Merge "Merge "Only preload selected pages" into oc-dev am:
314457a424 am:
4116849cfb" into oc-dr1-dev-plus-aosp
Philip P. Moltmann [Sat, 17 Jun 2017 03:02:42 +0000 (03:02 +0000)]
Merge "Only preload selected pages" into oc-dev am:
314457a424
am:
1af7c0bdbe
Change-Id: Ia3ecca3507a8d3b2e18dee59f83af0c0804ab68c
Philip P. Moltmann [Sat, 17 Jun 2017 03:02:37 +0000 (03:02 +0000)]
Merge "Only preload selected pages" into oc-dev am:
314457a424
am:
4116849cfb
Change-Id: I9dd4081136a3a3369f954acdd296b99976a31458
Philip P. Moltmann [Sat, 17 Jun 2017 02:57:26 +0000 (02:57 +0000)]
Merge "Only preload selected pages" into oc-dev
am:
314457a424
Change-Id: Ice10d16e149ce7807c50b413939cb71caf52f715
Philip P. Moltmann [Sat, 17 Jun 2017 02:55:42 +0000 (02:55 +0000)]
Merge "Only preload selected pages" into oc-dev
am:
314457a424
Change-Id: Id45d32474d29f4e71fa85997088e7a478b659baf
TreeHugger Robot [Sat, 17 Jun 2017 02:49:55 +0000 (02:49 +0000)]
Merge "Only preload selected pages" into oc-dev
Sundeep Ghuman [Sat, 17 Jun 2017 02:42:18 +0000 (02:42 +0000)]
Merge "Merge "APs from old scans should not have RSSI values set." into oc-dev am:
65c00b2f4e am:
a2f661612d" into oc-dr1-dev-plus-aosp
am:
705b111461
Change-Id: Icc07729d64dfe0c7ec3c38f7f5a1323792558ae0
Sundeep Ghuman [Sat, 17 Jun 2017 02:39:23 +0000 (02:39 +0000)]
Merge "APs from old scans should not have RSSI values set." into oc-dev am:
65c00b2f4e am:
4127bdafc7
am:
c6e7087700
Change-Id: I2c80ab0bfc79d61414af9ba50362256ce68ddd8c
Android Build Merger (Role) [Sat, 17 Jun 2017 02:35:37 +0000 (02:35 +0000)]
Merge "Merge "APs from old scans should not have RSSI values set." into oc-dev am:
65c00b2f4e am:
a2f661612d" into oc-dr1-dev-plus-aosp
Sundeep Ghuman [Sat, 17 Jun 2017 02:32:45 +0000 (02:32 +0000)]
Merge "APs from old scans should not have RSSI values set." into oc-dev am:
65c00b2f4e
am:
a2f661612d
Change-Id: Iff19ad943b40ba317542ddebb505eb27175ac627
Sundeep Ghuman [Sat, 17 Jun 2017 02:32:36 +0000 (02:32 +0000)]
Merge "APs from old scans should not have RSSI values set." into oc-dev am:
65c00b2f4e
am:
4127bdafc7
Change-Id: Iee8ffdde7970a5c623f4820d3e27531df2beb795
Sundeep Ghuman [Sat, 17 Jun 2017 02:26:02 +0000 (02:26 +0000)]
Merge "APs from old scans should not have RSSI values set." into oc-dev
am:
65c00b2f4e
Change-Id: I543f873621ffa26818d6b237d8ed3d1c7769ad98
Sundeep Ghuman [Sat, 17 Jun 2017 02:25:57 +0000 (02:25 +0000)]
Merge "APs from old scans should not have RSSI values set." into oc-dev
am:
65c00b2f4e
Change-Id: I46fc6ca0334f2637007fc188304310475267a20c
TreeHugger Robot [Sat, 17 Jun 2017 02:15:02 +0000 (02:15 +0000)]
Merge "APs from old scans should not have RSSI values set." into oc-dev
OSDN Git Service
