Lucas Dupin
04bc292787
Merge "Merge "Fix null pointer when mColorFadeEnabled is false" into oc-mr1-dev am: a4b6b9d265" into oc-mr1-dev-plus-aosp
...
am: 88b7016a39
2017-08-17 03:14:09 +00:00
Luis Hector Chavez
1f57cea5f4
Merge "Merge "Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55" into oc-dev-plus-aosp am: 2da7dfe179 am: 9b2a564764" into oc-mr1-dev-plus-aosp
...
am: 15cc48470d
2017-08-17 03:09:10 +00:00
Felipe Leme
3c0555eca0
Merge "Merge changes I768830f5,I665bde3a into oc-mr1-dev am: 7876b630be" into oc-mr1-dev-plus-aosp
...
am: 08ca3cc7e8
2017-08-17 03:04:57 +00:00
Luis Hector Chavez
07f403a0ea
Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55 am: 755baf92b4 am: 64f1d42e6c
...
am: 22f95dbdc0
2017-08-17 02:59:38 +00:00
Android Build Merger (Role)
fd54d86fe0
Merge "Merge "Improved autofill support on DatePicker and TimePicker:" into oc-mr1-dev am: 6598a4ed52 am: e6be222bdf"
2017-08-17 02:20:28 +00:00
Felipe Leme
ee5aa78c2e
Merge "Improved autofill support on DatePicker and TimePicker:" into oc-mr1-dev am: 6598a4ed52
...
am: e6be222bdf
2017-08-17 02:16:10 +00:00
Android Build Merger (Role)
e057d65711
Merge "Merge "Merge "Add CollationRoot to preloaded classes" into oc-mr1-dev am: 9585680167" into oc-mr1-dev-plus-aosp am: 8701d39bb6"
2017-08-17 02:14:27 +00:00
Sudheer Shanka
8e1c376d69
Merge "Fix and enable ConnOnActivityStartTest."
2017-08-17 02:10:44 +00:00
Mathieu Chartier
c58ba22fbc
Merge "Merge "Add CollationRoot to preloaded classes" into oc-mr1-dev am: 9585680167" into oc-mr1-dev-plus-aosp
...
am: 8701d39bb6
2017-08-17 02:10:36 +00:00
Qingxi Li
9c6cf66740
Merge "Merge "Fix problems of SIM lock screen of eSIM" into oc-mr1-dev am: e8d01e269b" into oc-mr1-dev-plus-aosp
...
am: 0f69a41103
2017-08-17 02:03:18 +00:00
Bill Yi
f2fbc61704
Merge "Merge "Revert "Import translations. DO NOT MERGE"" into oc-dr1-dev am: 2dc7e093b4 -s ours am: a8d17297aa -s ours" into oc-mr1-dev-plus-aosp
...
am: ca5177297c
2017-08-17 01:59:17 +00:00
Bill Yi
12df9f3ffb
Merge "Merge "Revert "Import translations. DO NOT MERGE"" into oc-dr1-dev am: 2dc7e093b4 -s ours am: 52bffa5250 -s ours" into oc-mr1-dev-plus-aosp
...
am: c59ea4d87c
2017-08-17 01:55:02 +00:00
Charles He
229f505d7c
Merge "Merge "Merge "Fix security hole in GateKeeperResponse." into mnc-dev am: 039b357a46 -s ours am: 5048fc8e92 am: 5d34739d70 am: 733c7607d1 am: 6adae5108c am: a175bae662 am: 510f02244d am: 69ae08b680 am: 35c3b58d46 am: c29ad5c94c" into oc-dr1-dev am: 51654d921f am: a4e586511b" into oc-mr1-dev-plus-aosp
...
am: 9a458a1637
2017-08-17 01:50:13 +00:00
Bill Yi
9d270bd726
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: fd457b1220 -s ours" into oc-dr1-dev-plus-aosp am: 260e4eb742 -s ours" into oc-mr1-dev-plus-aosp
...
am: 7c6245ecce
2017-08-17 01:45:19 +00:00
Charles He
a60ebf60e4
Merge "Merge "Fix security hole in GateKeeperResponse." into mnc-dev am: 039b357a46 -s ours am: 5048fc8e92 am: 5d34739d70 am: 733c7607d1 am: 6adae5108c am: a175bae662 am: 510f02244d am: 69ae08b680 am: 35c3b58d46 am: c29ad5c94c" into oc-dr1-dev am: 51654d921f am: 4e6e2792a6
...
am: 9ecbdeefd8
2017-08-17 01:38:09 +00:00
Bill Yi
2cbb529df5
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: fd457b1220 -s ours am: c9246aef85 -s ours" into oc-mr1-dev-plus-aosp
...
am: 334d71c98d
2017-08-17 01:31:44 +00:00
Charles He
f4280671a0
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am: 039b357a46 -s ours am: 5048fc8e92 am: 5d34739d70 am: 733c7607d1 am: 6adae5108c am: a175bae662 am: 510f02244d am: 69ae08b680 am: 35c3b58d46 am: c29ad5c94c am: fe99b8c03e am: f1d62161f8
...
am: 428e88a922
2017-08-17 01:28:28 +00:00
Bryan Eyler
60ee6b7ebd
Merge "Add the margin between user pods." into oc-mr1-dev am: 060a9d1021
...
am: 5b78ec177a
2017-08-17 01:24:40 +00:00
Makoto Onuki
2eecd31e94
Merge "Merge "Fix sync back-off" into oc-dr1-dev am: 9fd497cdae am: 85f81a6b62" into oc-mr1-dev-plus-aosp
...
am: f7e41d78ba
2017-08-17 01:13:31 +00:00
Makoto Onuki
1fa979ca82
Merge "Fix sync back-off" into oc-dr1-dev am: 9fd497cdae am: 89d8804c8e
...
am: f617d17ef6
2017-08-17 01:07:29 +00:00
Lucas Dupin
bc3a3df807
Merge "Do not filter out some colors" into oc-mr1-dev am: a9774680f8
...
am: 69bb2bae90
2017-08-17 01:03:22 +00:00
Kevin Hufnagle
d1574102b9
Merge "Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5 am: d6d6d2cf79" into oc-dr1-dev-plus-aosp am: 7d0dcbb13d
...
am: 3de8e434c2
2017-08-17 00:57:40 +00:00
Kevin Hufnagle
e714ef3396
Merge "Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5 am: b9db19de6a am: 0df906d279" into oc-mr1-dev-plus-aosp
...
am: cff0fad96c
2017-08-17 00:53:04 +00:00
Kevin Hufnagle
be25fc4240
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5 am: d6d6d2cf79 am: 9c43a77971
...
am: 817b77489c
2017-08-17 00:49:26 +00:00
Cindy Kuang
d67984ebfb
Merge "Merge "docs: corrected code example mistakes" into oc-dev am: 5714da6e93 am: 3311ba316a" into oc-mr1-dev am: 56891ed4d4
...
am: f0b9ef7714
2017-08-17 00:44:17 +00:00
Bryce Lee
a7ec0565c6
Merge "Update references to O MR1 to proper codename." into oc-mr1-dev am: 92a84efba1
...
am: a0cc0c5c90
2017-08-17 00:39:20 +00:00
Cindy Kuang
0a3fbdd830
Merge "Merge "docs: corrected code example mistakes" into oc-dev am: 5714da6e93 am: 3311ba316a am: 1181c6895c" into oc-mr1-dev-plus-aosp
...
am: 7655076954
2017-08-17 00:31:23 +00:00
TreeHugger Robot
827e31f841
Merge "AAPT2: Add a APK filtering."
2017-08-16 23:55:16 +00:00
TreeHugger Robot
abe61c2a47
Merge "Add deltaX/Y to a11y scroll events"
2017-08-16 23:33:09 +00:00
Android Build Merger (Role)
88b7016a39
Merge "Merge "Fix null pointer when mColorFadeEnabled is false" into oc-mr1-dev am: a4b6b9d265" into oc-mr1-dev-plus-aosp
2017-08-16 23:24:10 +00:00
Android Build Merger (Role)
15cc48470d
Merge "Merge "Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55" into oc-dev-plus-aosp am: 2da7dfe179 am: 9b2a564764" into oc-mr1-dev-plus-aosp
2017-08-16 23:23:29 +00:00
Lucas Dupin
6bc59347ec
Merge "Fix null pointer when mColorFadeEnabled is false" into oc-mr1-dev
...
am: a4b6b9d265
2017-08-16 23:19:24 +00:00
Luis Hector Chavez
8c535df44d
Merge "Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55" into oc-dev-plus-aosp am: 2da7dfe179
...
am: 9b2a564764
2017-08-16 23:18:55 +00:00
Android Build Merger (Role)
08ca3cc7e8
Merge "Merge changes I768830f5,I665bde3a into oc-mr1-dev am: 7876b630be" into oc-mr1-dev-plus-aosp
2017-08-16 23:17:57 +00:00
Felipe Leme
05deaf54cc
Merge changes I768830f5,I665bde3a into oc-mr1-dev
...
am: 7876b630be
2017-08-16 23:13:57 +00:00
Luis Hector Chavez
22f95dbdc0
Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55 am: 755baf92b4
...
am: 64f1d42e6c
2017-08-16 23:11:35 +00:00
Felipe Leme
e6be222bdf
Merge "Improved autofill support on DatePicker and TimePicker:" into oc-mr1-dev
...
am: 6598a4ed52
2017-08-16 22:51:52 +00:00
TreeHugger Robot
07ea63bf83
Merge "Remove mSeen from AccessPoint."
2017-08-16 22:39:04 +00:00
Lucas Dupin
a4b6b9d265
Merge "Fix null pointer when mColorFadeEnabled is false" into oc-mr1-dev
2017-08-16 22:30:04 +00:00
Luis Hector Chavez
9b2a564764
Merge "Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55" into oc-dev-plus-aosp
...
am: 2da7dfe179
2017-08-16 22:17:02 +00:00
Luis Hector Chavez
64f1d42e6c
Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55
...
am: 755baf92b4
2017-08-16 22:11:14 +00:00
TreeHugger Robot
7876b630be
Merge changes I768830f5,I665bde3a into oc-mr1-dev
...
* changes:
Removed redundant [X] icon used to close Autofill Save UI.
Re-added outer layout on Autofill Save UI that was accidentally removed.
2017-08-16 22:11:12 +00:00
TreeHugger Robot
6598a4ed52
Merge "Improved autofill support on DatePicker and TimePicker:" into oc-mr1-dev
2017-08-16 22:10:46 +00:00
Todd Kennedy
519b589300
resolve merge conflicts of d22603ebd2 to master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iab4443f6a8b996ea9f28f4e68c6ec3bb708526e6
2017-08-16 15:00:20 -07:00
Android Build Merger (Role)
2da7dfe179
Merge "Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55" into oc-dev-plus-aosp
2017-08-16 21:56:15 +00:00
Luis Hector Chavez
e4519cdedc
Merge "Improve container capability bounding in containers" am: 586fd52b34
...
am: ed05287c55
2017-08-16 21:51:27 +00:00
Luis Hector Chavez
755baf92b4
Merge "Improve container capability bounding in containers" am: 586fd52b34
...
am: ed05287c55
2017-08-16 21:43:28 +00:00
Sudheer Shanka
ded7ab0fff
Fix and enable ConnOnActivityStartTest.
...
- Set parole duration to 0 so that it won't affect app standby test.
- Use a bound service to send commands to test app instead of broadcasts.
- Remove code to install/delete test app as it will be done as part of tests
initialization.
Bug: 38432755
Test: forrest --extra_args='--class com.android.server.net.ConnOnActivityStartTest' \
test FrameworksServicesTests
Change-Id: Ic6cd574a60c4449195f2c8cd4e04b9cb47f225c8
2017-08-16 14:41:11 -07:00
Android Build Merger (Role)
8701d39bb6
Merge "Merge "Add CollationRoot to preloaded classes" into oc-mr1-dev am: 9585680167" into oc-mr1-dev-plus-aosp
2017-08-16 21:39:46 +00:00
Mathieu Chartier
aed758dbf4
Merge "Add CollationRoot to preloaded classes" into oc-mr1-dev
...
am: 9585680167
2017-08-16 21:36:32 +00:00
