Commit Graph

469164 Commits

Author SHA1 Message Date
Automerger Merge Worker
bb09ceaf09 Merge "Build framework-tethering against module_current" am: 6deeff3406 am: bb0fc42dc1 am: 4a7aa0b231 am: f2bc0f5b57 am: 5c4c221316
Change-Id: Id6051296a02060179666b67fc6ea9092273c1780
2020-02-25 04:34:26 +00:00
Automerger Merge Worker
98c28da16b Merge "wifi: Revise java doc to add more explanation" into rvc-dev am: 426b08e2f4 am: 741e10f167 am: 0a0c7e1f89 am: 9f22f7d0fd
Change-Id: Ia9b3a905fc179da423cd6df8b74ff29cb8fb05ae
2020-02-25 04:33:47 +00:00
Automerger Merge Worker
5c4c221316 Merge "Build framework-tethering against module_current" am: 6deeff3406 am: bb0fc42dc1 am: 4a7aa0b231 am: f2bc0f5b57
Change-Id: I4a0e6235d2c0a9bd4453cbce26cca6b9dbc5acdb
2020-02-25 04:25:10 +00:00
Automerger Merge Worker
9f22f7d0fd Merge "wifi: Revise java doc to add more explanation" into rvc-dev am: 426b08e2f4 am: 741e10f167 am: 0a0c7e1f89
Change-Id: I4a23cea0e56c3ff57b4150cd319c4420ccd99887
2020-02-25 04:24:46 +00:00
Automerger Merge Worker
6948499020 [automerger skipped] Merge "Clarifying meaning of items param in javadoc per feedback" into rvc-dev am: a493b5c516 am: 47f2bf7db4 -s ours am: c531ed5419 -s ours am: 7ff62f3212 -s ours
am skip reason: Change-Id Ic021f6fc37e7fce8e9b052d7434d0dc1569724ea with SHA-1 799b7deb72 is in history

Change-Id: Id7cd4c118af81587dea60a83496ef00a8eb993e8
2020-02-25 04:21:42 +00:00
Automerger Merge Worker
430e07d6eb [automerger skipped] Merge "Merge "Clarifying meaning of items param in javadoc per feedback" into rvc-dev am: a493b5c516 am: 2f23e9d85a am: 1198679ecb" into rvc-qpr-dev-plus-aosp am: 3ca983637f -s ours
am skip reason: Change-Id Ic021f6fc37e7fce8e9b052d7434d0dc1569724ea with SHA-1 799b7deb72 is in history

Change-Id: I5f86886e93891555175b7527874ee61b6e227c31
2020-02-25 04:21:30 +00:00
Automerger Merge Worker
97d5d5b1fe [automerger skipped] Merge "Clarifying meaning of items param in javadoc per feedback" into rvc-dev am: a493b5c516 am: 2f23e9d85a am: d15abb58a5 am: 7c097b8991 -s ours
am skip reason: Change-Id Ic021f6fc37e7fce8e9b052d7434d0dc1569724ea with SHA-1 fa1062ac43 is in history

Change-Id: Ifab46b82753d768da735df6682cd20694e9888ce
2020-02-25 04:21:10 +00:00
Automerger Merge Worker
f2bc0f5b57 Merge "Build framework-tethering against module_current" am: 6deeff3406 am: bb0fc42dc1 am: 4a7aa0b231
Change-Id: I36e79f35c297261b19a58cc76dffad5f52172f1c
2020-02-25 04:16:52 +00:00
Automerger Merge Worker
0a0c7e1f89 Merge "wifi: Revise java doc to add more explanation" into rvc-dev am: 426b08e2f4 am: 741e10f167
Change-Id: Ic2345d59c0073c2996fe019a7b8c8c0d1c52e534
2020-02-25 04:16:39 +00:00
Automerger Merge Worker
7ff62f3212 [automerger skipped] Merge "Clarifying meaning of items param in javadoc per feedback" into rvc-dev am: a493b5c516 am: 47f2bf7db4 -s ours am: c531ed5419 -s ours
am skip reason: Change-Id Ic021f6fc37e7fce8e9b052d7434d0dc1569724ea with SHA-1 799b7deb72 is in history

Change-Id: Ia0e3680545fb5ab42b660860ba2ca7072370fa30
2020-02-25 04:09:54 +00:00
Automerger Merge Worker
3ca983637f Merge "Merge "Clarifying meaning of items param in javadoc per feedback" into rvc-dev am: a493b5c516 am: 2f23e9d85a am: 1198679ecb" into rvc-qpr-dev-plus-aosp 2020-02-25 04:09:38 +00:00
Automerger Merge Worker
99f3530717 Merge "Clarifying meaning of items param in javadoc per feedback" into rvc-dev am: a493b5c516 am: 2f23e9d85a am: 1198679ecb
Change-Id: Ic33d97912a4afc9d758aba077c69394985a78d5d
2020-02-25 04:09:29 +00:00
Automerger Merge Worker
7c097b8991 Merge "Clarifying meaning of items param in javadoc per feedback" into rvc-dev am: a493b5c516 am: 2f23e9d85a am: d15abb58a5
Change-Id: I34031c07e31c88c7d7df20e6a2a8d68b33658ae4
2020-02-25 04:09:26 +00:00
Automerger Merge Worker
cfdff8666a [automerger skipped] Merge "Merge "Move PiP animation to SysUI package" into rvc-dev am: 0cbb2687ed am: 48e6a12f34" into rvc-d1-dev-plus-aosp am: 4159445696 -s ours am: e76b2e3a59 -s ours
am skip reason: Change-Id Id0c8ce03fa26952daf5e3687b18b2eb2375b7d20 with SHA-1 85cf41fcc3 is in history

Change-Id: I9e54da93f0aa07ddb1b6441ed544df074160d1ea
2020-02-25 04:04:34 +00:00
Automerger Merge Worker
2c0b44a40f [automerger skipped] Merge "Move PiP animation to SysUI package" into rvc-dev am: 0cbb2687ed am: d453ecc9a3 am: b33576001a am: 617f8b1bab -s ours
am skip reason: Change-Id Id0c8ce03fa26952daf5e3687b18b2eb2375b7d20 with SHA-1 85cf41fcc3 is in history

Change-Id: Ib2433f5e4627bdd2971029daf14c9ca160da5d0f
2020-02-25 04:03:56 +00:00
Automerger Merge Worker
4a7aa0b231 Merge "Build framework-tethering against module_current" am: 6deeff3406 am: bb0fc42dc1
Change-Id: I5e0c2e973fb79692ad245a74def946865caedfcc
2020-02-25 04:03:45 +00:00
Automerger Merge Worker
741e10f167 Merge "wifi: Revise java doc to add more explanation" into rvc-dev am: 426b08e2f4
Change-Id: I403fcef26ee106317c6b8bee99b8df037a9d5777
2020-02-25 04:03:28 +00:00
Automerger Merge Worker
6c6d489610 [automerger skipped] Merge "Move PiP animation to SysUI package" into rvc-dev am: 0cbb2687ed am: d453ecc9a3 am: fd2bc89dc7 am: 8a3e2f6077 -s ours
am skip reason: Change-Id Id0c8ce03fa26952daf5e3687b18b2eb2375b7d20 with SHA-1 7171aca7a0 is in history

Change-Id: I25256b6ad4f50044b680e6494ac77b69956198f1
2020-02-25 04:03:28 +00:00
Automerger Merge Worker
c531ed5419 [automerger skipped] Merge "Clarifying meaning of items param in javadoc per feedback" into rvc-dev am: a493b5c516 am: 47f2bf7db4 -s ours
am skip reason: Change-Id Ic021f6fc37e7fce8e9b052d7434d0dc1569724ea with SHA-1 799b7deb72 is in history

Change-Id: I37a0d1d9046a80b4f3526d18cbc8d40a54821e3d
2020-02-25 03:58:37 +00:00
Automerger Merge Worker
1198679ecb Merge "Clarifying meaning of items param in javadoc per feedback" into rvc-dev am: a493b5c516 am: 2f23e9d85a
Change-Id: Ib466c25d7676883163eaf49fcc7b91e95ca44c4f
2020-02-25 03:58:27 +00:00
Automerger Merge Worker
d15abb58a5 Merge "Clarifying meaning of items param in javadoc per feedback" into rvc-dev am: a493b5c516 am: 2f23e9d85a
Change-Id: I22411956eea2cb1fad18f29ac308c8539deb6bdd
2020-02-25 03:58:07 +00:00
Automerger Merge Worker
e76b2e3a59 [automerger skipped] Merge "Merge "Move PiP animation to SysUI package" into rvc-dev am: 0cbb2687ed am: 48e6a12f34" into rvc-d1-dev-plus-aosp am: 4159445696 -s ours
am skip reason: Change-Id Id0c8ce03fa26952daf5e3687b18b2eb2375b7d20 with SHA-1 85cf41fcc3 is in history

Change-Id: I86fa97143878168b62ac1f468e2f41e660e0c576
2020-02-25 03:50:11 +00:00
Automerger Merge Worker
617f8b1bab Merge "Move PiP animation to SysUI package" into rvc-dev am: 0cbb2687ed am: d453ecc9a3 am: b33576001a
Change-Id: I3dc72d73f87e677edbceb8b2255cfb8f024f6687
2020-02-25 03:49:46 +00:00
Automerger Merge Worker
8a3e2f6077 Merge "Move PiP animation to SysUI package" into rvc-dev am: 0cbb2687ed am: d453ecc9a3 am: fd2bc89dc7
Change-Id: If21dd5877118f390ca95f1f9889723389e8c8663
2020-02-25 03:49:37 +00:00
Automerger Merge Worker
bb0fc42dc1 Merge "Build framework-tethering against module_current" am: 6deeff3406
Change-Id: Id71eb0881f89da751cda6e11fe9019452d7b8ca9
2020-02-25 03:49:31 +00:00
TreeHugger Robot
426b08e2f4 Merge "wifi: Revise java doc to add more explanation" into rvc-dev 2020-02-25 03:48:14 +00:00
Automerger Merge Worker
47f2bf7db4 Merge "Clarifying meaning of items param in javadoc per feedback" into rvc-dev am: a493b5c516
Change-Id: If8761a123331677c05f373711495ed30d75d20d8
2020-02-25 03:39:30 +00:00
Automerger Merge Worker
2f23e9d85a Merge "Clarifying meaning of items param in javadoc per feedback" into rvc-dev am: a493b5c516
Change-Id: Ib0c9df9211a721e83e003e98f0f66b3d0f097b2b
2020-02-25 03:39:18 +00:00
Automerger Merge Worker
4159445696 Merge "Merge "Move PiP animation to SysUI package" into rvc-dev am: 0cbb2687ed am: 48e6a12f34" into rvc-d1-dev-plus-aosp 2020-02-25 03:31:26 +00:00
Automerger Merge Worker
270514b435 Merge "Move PiP animation to SysUI package" into rvc-dev am: 0cbb2687ed am: 48e6a12f34
Change-Id: I5e46045146f217b853042e4c87c34ae0842e555a
2020-02-25 03:31:19 +00:00
Automerger Merge Worker
fd2bc89dc7 Merge "Move PiP animation to SysUI package" into rvc-dev am: 0cbb2687ed am: d453ecc9a3
Change-Id: I491995f993962608cf6a0e194ce808f0a3010582
2020-02-25 03:31:16 +00:00
Automerger Merge Worker
b33576001a Merge "Move PiP animation to SysUI package" into rvc-dev am: 0cbb2687ed am: d453ecc9a3
Change-Id: I0905f112d542aae8eacd222d64cecf2634dd10bb
2020-02-25 03:31:09 +00:00
Mark Chien
6deeff3406 Merge "Build framework-tethering against module_current" 2020-02-25 03:28:26 +00:00
TreeHugger Robot
a493b5c516 Merge "Clarifying meaning of items param in javadoc per feedback" into rvc-dev 2020-02-25 03:24:39 +00:00
Automerger Merge Worker
d453ecc9a3 Merge "Move PiP animation to SysUI package" into rvc-dev am: 0cbb2687ed
Change-Id: I596212bcfae0b8c7c3f40471ecc01723420ec7e2
2020-02-25 03:21:25 +00:00
Automerger Merge Worker
48e6a12f34 Merge "Move PiP animation to SysUI package" into rvc-dev am: 0cbb2687ed
Change-Id: I8905ee784070a09fbf23db25ff714a2d9249d489
2020-02-25 03:21:06 +00:00
TreeHugger Robot
0cbb2687ed Merge "Move PiP animation to SysUI package" into rvc-dev 2020-02-25 03:10:24 +00:00
Automerger Merge Worker
5f9211f258 Merge "Fix wrong parameter fieldIndex caused IndexOutOfBoundsException" into rvc-dev am: 599d349712 am: 3c011b271e am: 690f9d344d am: 3652fb2f00
Change-Id: I33f20207ec36f81f3da0d18d1af89be323c9f296
2020-02-25 03:07:20 +00:00
Automerger Merge Worker
5d0b1bd52d Merge "Add Option To Prevent Wake On Back Key Press" into rvc-dev am: ba58fd615f am: 48976ab9e7 am: c2cd048634 am: 4796a182b2
Change-Id: Ie98e71698ff970beed522a0b2fb48252c57a515d
2020-02-25 03:07:12 +00:00
Automerger Merge Worker
f8b6b0a09c Merge "Merge "Fix wrong parameter fieldIndex caused IndexOutOfBoundsException" into rvc-dev am: 599d349712 am: 3c011b271e am: dd7e1bcaf9" into rvc-qpr-dev-plus-aosp am: fd5b4d8a5d
Change-Id: Iced56dc9ed862653a27d9c5daf098d119a7940b9
2020-02-25 03:07:00 +00:00
Automerger Merge Worker
3c1dea3637 Merge "Fix wrong parameter fieldIndex caused IndexOutOfBoundsException" into rvc-dev am: 599d349712 am: e674a80f70 am: 771dceaef4 am: d3e28353df
Change-Id: I299f55fee99b3d62ab48ae6f30b005c1eb0ccc55
2020-02-25 03:06:49 +00:00
Automerger Merge Worker
4a30b64d65 Merge "Add Option To Prevent Wake On Back Key Press" into rvc-dev am: ba58fd615f am: 48976ab9e7 am: 3a14b88aaa am: 5b860a92d6
Change-Id: I4e89187ef69dedf3287663dbe016459112f5a84e
2020-02-25 03:06:41 +00:00
Automerger Merge Worker
8e80a9e5b2 Merge "Add Option To Prevent Wake On Back Key Press" into rvc-dev am: ba58fd615f am: d4797a1dfb am: d2c04ff861 am: 9408c534fe
Change-Id: I81d07b22c12305642d0ff69a9a09607f11a5b230
2020-02-25 03:06:04 +00:00
PETER LIANG
01302a8618 Merge "Remove the public APIs for allow rich content." 2020-02-25 02:50:22 +00:00
Automerger Merge Worker
3652fb2f00 Merge "Fix wrong parameter fieldIndex caused IndexOutOfBoundsException" into rvc-dev am: 599d349712 am: 3c011b271e am: 690f9d344d
Change-Id: Ibe002d165061ee90cd59e9aa0be297d6edd171d6
2020-02-25 02:50:00 +00:00
Automerger Merge Worker
4796a182b2 Merge "Add Option To Prevent Wake On Back Key Press" into rvc-dev am: ba58fd615f am: 48976ab9e7 am: c2cd048634
Change-Id: I25a633ae0cc2120aab170d1f9a24a5656f992b94
2020-02-25 02:49:52 +00:00
Automerger Merge Worker
fd5b4d8a5d Merge "Merge "Fix wrong parameter fieldIndex caused IndexOutOfBoundsException" into rvc-dev am: 599d349712 am: 3c011b271e am: dd7e1bcaf9" into rvc-qpr-dev-plus-aosp 2020-02-25 02:49:31 +00:00
Automerger Merge Worker
bfcbfab192 Merge "Fix wrong parameter fieldIndex caused IndexOutOfBoundsException" into rvc-dev am: 599d349712 am: 3c011b271e am: dd7e1bcaf9
Change-Id: I9d254da11c83237b5986d728e64dcc8e92dffe15
2020-02-25 02:49:27 +00:00
Automerger Merge Worker
d3e28353df Merge "Fix wrong parameter fieldIndex caused IndexOutOfBoundsException" into rvc-dev am: 599d349712 am: e674a80f70 am: 771dceaef4
Change-Id: I2dd17a839b0dcfffcc23627a6ff43917785178dd
2020-02-25 02:49:23 +00:00
Automerger Merge Worker
5b860a92d6 Merge "Add Option To Prevent Wake On Back Key Press" into rvc-dev am: ba58fd615f am: 48976ab9e7 am: 3a14b88aaa
Change-Id: If0f654721d3377315cfef4155f082de39ad92ffa
2020-02-25 02:49:14 +00:00