OSDN Git Service
Bill Yi [Sat, 16 Sep 2017 21:24:54 +0000 (21:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
420ae05329 -s ours
am:
52ff2bf2a1 -s ours
Change-Id: I0384a49cb23e1f48509582e71909f7245482ec15
Bill Yi [Sat, 16 Sep 2017 21:12:11 +0000 (21:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
9b4683842d -s ours
am:
e43dfbad3b -s ours
Change-Id: I98987578264825dd13d5519c9e40b2865d45715c
Bill Yi [Sat, 16 Sep 2017 21:11:47 +0000 (21:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
420ae05329 -s ours
Change-Id: I2e7ae35b30cdf2c3f8b047f279e385d1a961b6c6
Bill Yi [Sat, 16 Sep 2017 21:05:53 +0000 (21:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
ba3347b48a -s ours
am:
2e3be621b6 -s ours
Change-Id: I090819b1cae93821cb2b9a135a511724813ed724
TreeHugger Robot [Sat, 16 Sep 2017 20:52:54 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 20:51:01 +0000 (20:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
adbd504f40 -s ours
am:
2a8bb45240 -s ours
Change-Id: I9938a0ebaa742d84ba067dd9034551510c74b4e0
Bill Yi [Sat, 16 Sep 2017 20:50:00 +0000 (20:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
9b4683842d -s ours
Change-Id: I181876ca8f124875296af5c91d90788d44e6e690
Bill Yi [Sat, 16 Sep 2017 20:46:31 +0000 (20:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
ba3347b48a -s ours
Change-Id: I51b7f30fb9f32d74eb4a5df4fa0b84da834510c1
Bill Yi [Sat, 16 Sep 2017 20:43:29 +0000 (20:43 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
4498012c8b -s ours
am:
acc482472c -s ours
Change-Id: I425ba41ae996e418d280326c58a2d1e87f5a615d
Bill Yi [Sat, 16 Sep 2017 20:34:19 +0000 (20:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
3231634e2b -s ours
am:
62ee030f38 -s ours
Change-Id: I5e5a7af38854b1d5a5c15aa5fdcb128323e96bb4
Bill Yi [Sat, 16 Sep 2017 20:29:36 +0000 (20:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
adbd504f40 -s ours
Change-Id: Ib897fe4ba9ab7bffb8b6c88054cbe588068c13d1
Bill Yi [Sat, 16 Sep 2017 20:27:45 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
e0b4672a4e -s ours
am:
55f717f446 -s ours
Change-Id: Ic808ffbe7cbfae810aae478a951ad65a9ba6cccb
Bill Yi [Sat, 16 Sep 2017 20:26:10 +0000 (20:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
4498012c8b -s ours
Change-Id: I250606ea6088f6deedd77aec93af2c615488ded7
Bill Yi [Sat, 16 Sep 2017 20:22:56 +0000 (20:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
14a340ff61 -s ours
am:
4a4fda8901 -s ours
Change-Id: Ic16e122490cfcee5796974c2c30f1c2e1a9e8892
Bill Yi [Sat, 16 Sep 2017 20:22:13 +0000 (20:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
3231634e2b -s ours
Change-Id: Ied3dddf8b55950c972a22bb1f1c9f2ceb6063318
TreeHugger Robot [Sat, 16 Sep 2017 20:19:42 +0000 (20:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 20:18:48 +0000 (20:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
fa04d2e02a -s ours
am:
7e1d4c91b9 -s ours
Change-Id: I308b234ddaca3768836fbf88b8f45704cdc470b3
Bill Yi [Sat, 16 Sep 2017 20:17:07 +0000 (20:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
e0b4672a4e -s ours
Change-Id: Ic055179f584322b0cfa1f4228ee418ecd17d3e32
Bill Yi [Sat, 16 Sep 2017 20:12:06 +0000 (20:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
22d6738d16 -s ours
am:
6ea0804dfc -s ours
Change-Id: Iabc68690a3172afce6821591d42dc9a2157e1d33
Bill Yi [Sat, 16 Sep 2017 20:12:00 +0000 (20:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
14a340ff61 -s ours
Change-Id: Ice521e238b961521fd240f13a9481c551fe4e6f2
Bill Yi [Sat, 16 Sep 2017 20:08:25 +0000 (20:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
fa04d2e02a -s ours
Change-Id: Ifbf67ba7f1c928c2231ef56615a3e4a043fd93d2
Bill Yi [Sat, 16 Sep 2017 20:08:14 +0000 (20:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
9a2468011f -s ours
am:
ff2ef3477f -s ours
Change-Id: I8d4b998707f586d0b1a6b93e8515d9dc44efd3be
TreeHugger Robot [Sat, 16 Sep 2017 20:05:22 +0000 (20:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 20:02:32 +0000 (20:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 20:01:58 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
22d6738d16 -s ours
Change-Id: Ic81940cfa222f3ac337e053d10338cfa9108ce54
TreeHugger Robot [Sat, 16 Sep 2017 20:01:27 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 20:00:33 +0000 (20:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 19:59:02 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 19:58:19 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
fc9d5e5764 -s ours
am:
ee7c521595 -s ours
Change-Id: I6c6611dc22b79ce04981a4a14284f96ca7f30b2a
Bill Yi [Sat, 16 Sep 2017 19:57:00 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
9a2468011f -s ours
Change-Id: I151617e795e41cadc3dbd7d97a065c1c5672d74a
TreeHugger Robot [Sat, 16 Sep 2017 19:53:46 +0000 (19:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 19:53:10 +0000 (19:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bryce Lee [Sat, 16 Sep 2017 19:50:38 +0000 (19:50 +0000)]
Merge "Do not stop paused activity when sleeping." into oc-mr1-dev am:
af17d47351
am:
89c87991a3
Change-Id: Id1c906f9263d8ff9226469ba7d3c0d860909d738
TreeHugger Robot [Sat, 16 Sep 2017 19:50:26 +0000 (19:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 19:48:53 +0000 (19:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 19:47:33 +0000 (19:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
fc9d5e5764 -s ours
Change-Id: I5d22fdc3bd8914926c13cf0d0a832b1eedab6e36
Bryce Lee [Sat, 16 Sep 2017 19:42:38 +0000 (19:42 +0000)]
Merge "Do not stop paused activity when sleeping." into oc-mr1-dev
am:
af17d47351
Change-Id: I67a82290d737949a60a69d55aabacde51407a007
TreeHugger Robot [Sat, 16 Sep 2017 19:33:49 +0000 (19:33 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bryce Lee [Sat, 16 Sep 2017 19:33:21 +0000 (19:33 +0000)]
Merge "Do not stop paused activity when sleeping." into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 13:17:52 +0000 (06:17 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ided02ec91e7a2f5aacd8e5c28201672d14fceea7
Bill Yi [Sat, 16 Sep 2017 12:57:19 +0000 (05:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I6dab1e6544868c0ac2e0e4029a969a216f4c9b4d
TreeHugger Robot [Sat, 16 Sep 2017 11:46:45 +0000 (11:46 +0000)]
Merge "Fix InputMethodPreference.compareTo method"
Bill Yi [Sat, 16 Sep 2017 06:57:48 +0000 (23:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic2ce0ef69af1bfd9f4b8980b3079b9756f93763c
Bill Yi [Sat, 16 Sep 2017 06:50:17 +0000 (23:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I431251ef3dc0930b820a108edc6b76f876639035
Bill Yi [Sat, 16 Sep 2017 04:55:46 +0000 (21:55 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic586e92feca951793fd3cb9a401093e57e05b015
Bill Yi [Sat, 16 Sep 2017 04:48:17 +0000 (21:48 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I81c38a635544d1672a6cbd1dc9528d95ccdbd894
Bill Yi [Sat, 16 Sep 2017 04:40:45 +0000 (21:40 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I3978b88537a89176a6926eab1c21e09ab169a2cc
Bill Yi [Sat, 16 Sep 2017 04:33:13 +0000 (21:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ib786e99af653b130f2547c8ed1e223f0ddbcf3c8
Bill Yi [Sat, 16 Sep 2017 04:03:41 +0000 (21:03 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I8d182fda9abf6a8c4f5bb4f62de78e61a5c3d627
Bill Yi [Sat, 16 Sep 2017 03:56:07 +0000 (20:56 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ifdd0077f7516e9266a9f38ff474bc8f71cc7591b
Bill Yi [Sat, 16 Sep 2017 03:48:15 +0000 (20:48 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I61400c4699a3694bc91bc6672e7dc62a28545bcc
Bill Yi [Sat, 16 Sep 2017 03:43:03 +0000 (20:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ie76a52fa6f6c717d78db5f9c338b1fde5cc6b4ad
TreeHugger Robot [Sat, 16 Sep 2017 02:53:53 +0000 (02:53 +0000)]
Merge "Avoid spaces in the trace file names."
Felipe Leme [Sat, 16 Sep 2017 02:01:40 +0000 (02:01 +0000)]
Merge "Fixed size of autofill service icon on Save affordance." into oc-mr1-dev am:
a8c2b36b33
am:
631b987234
Change-Id: Ic7a986486bc0e5a2e4cda86001b919e14aece214
Felipe Leme [Sat, 16 Sep 2017 01:53:46 +0000 (01:53 +0000)]
Merge "Fixed size of autofill service icon on Save affordance." into oc-mr1-dev
am:
a8c2b36b33
Change-Id: I771b71a9c189c7eeae30524bd155b5e4f94ad681
TreeHugger Robot [Sat, 16 Sep 2017 01:45:51 +0000 (01:45 +0000)]
Merge "Fixed size of autofill service icon on Save affordance." into oc-mr1-dev
gopinath [Sat, 16 Sep 2017 01:09:02 +0000 (18:09 -0700)]
Avoid spaces in the trace file names.
Having spaces in the trace file names introduces slashes in the
file names and not able to pull the file names with the slashes
from the device.So avoid having spaces while constructing the
trace file names.
Bug : b/
65737738
Change-Id: Ie1971566586f77d18b17722ce0e3cc9ef3ebfdd3
TreeHugger Robot [Sat, 16 Sep 2017 00:22:29 +0000 (00:22 +0000)]
Merge "Adding ability to add configs via adb command-line. The input must be in serialized binary format. Also fixes small issue in build rule related to proto lib."
Lucas Dupin [Fri, 15 Sep 2017 23:30:52 +0000 (23:30 +0000)]
Merge "Color extraction should not block switchUser" into oc-mr1-dev am:
4f65a35713
am:
c910573484
Change-Id: I507c2ab2a39df004ebca354fbee9a4150f9a818d
Lucas Dupin [Fri, 15 Sep 2017 23:23:48 +0000 (23:23 +0000)]
Merge "Color extraction should not block switchUser" into oc-mr1-dev
am:
4f65a35713
Change-Id: Ic77d657bef1e7336e1774395da26886e4840a03c
Lucas Dupin [Fri, 15 Sep 2017 23:17:43 +0000 (23:17 +0000)]
Merge "Color extraction should not block switchUser" into oc-mr1-dev
Felipe Leme [Fri, 15 Sep 2017 19:56:55 +0000 (12:56 -0700)]
Fixed size of autofill service icon on Save affordance.
Test: manual verification
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Bug:
65739885
Change-Id: Ic9efd7bbb853c28b2d869a609d21eff4e6ef6d2d
Jeff Sharkey [Fri, 15 Sep 2017 22:46:00 +0000 (22:46 +0000)]
Merge "Move long-running calls to async with listeners."
Bryce Lee [Fri, 15 Sep 2017 22:22:43 +0000 (15:22 -0700)]
Do not stop paused activity when sleeping.
This changelist removes logic added to stop a top level paused
activity when trying to sleep. Doing so delays sleep and leads to
double sleep requests on the client side as it will also try to
stop the activity on sleep.
Bug:
65457314
Test: manual
Change-Id: I252e2b968a537cf2d696972d6a65e43661875943
Selim Cinek [Fri, 15 Sep 2017 21:34:25 +0000 (21:34 +0000)]
Merge "Increased the text size for colorized notifications" into oc-mr1-dev am:
dd3b6c83c6
am:
f83e81117a
Change-Id: Ideb598d0c28ce8bb0b84913e4683dda453d522a6
Tim Zheng [Fri, 15 Sep 2017 21:28:14 +0000 (21:28 +0000)]
Merge "BackupManagerService uses BackupManagerConstants."
Selim Cinek [Fri, 15 Sep 2017 21:26:46 +0000 (21:26 +0000)]
Merge "Increased the text size for colorized notifications" into oc-mr1-dev
am:
dd3b6c83c6
Change-Id: Ifd1e83f3400bd870d087c1a248bb74b305aa313f
Selim Cinek [Fri, 15 Sep 2017 21:20:44 +0000 (21:20 +0000)]
Merge "Increased the text size for colorized notifications" into oc-mr1-dev
David Chen [Wed, 13 Sep 2017 22:53:39 +0000 (15:53 -0700)]
Adding ability to add configs via adb command-line. The input
must be in serialized binary format. Also fixes small issue
in build rule related to proto lib.
Test: Manually tested that ADB command works without crashing.
Change-Id: Iba2e677561ff500adb601a598f73e8a7b32540e5
Jeff Sharkey [Fri, 15 Sep 2017 18:57:59 +0000 (12:57 -0600)]
Move long-running calls to async with listeners.
Now that we're using Binder, we can have callers provide explicit
listeners for every request instead of trying to squeeze them all
into unsolicited socket events.
Move benchmarking to be async to avoid blocking other commands for
up to several minutes. Remove post-trim benchmarking flag, since
benchmarking now requires a separate callback. Will bring back in
a future CL.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AdoptableHostTest
Test: adb shell sm fstrim
Bug:
62201209,
13758960
Change-Id: I26f76c66734ac2fd0f64713b8ab9828430499019
TreeHugger Robot [Fri, 15 Sep 2017 20:15:35 +0000 (20:15 +0000)]
Merge "MediaPlayer: add notifyAt for TimeProvider"
Jan Althaus [Fri, 15 Sep 2017 20:01:23 +0000 (20:01 +0000)]
Merge "New metrics fields for selection logs" into oc-mr1-dev am:
0fe3b1aa13
am:
6ec03f7c1f -s ours
Change-Id: Id8bd1ae7fa2f02d4a787a126913dedf484967566
Tony Mak [Fri, 15 Sep 2017 19:51:23 +0000 (19:51 +0000)]
Merge "getInstalledDialerApplications should not count ForwardIntentToParent" into oc-mr1-dev am:
72befffcbc
am:
c5145fa25a
Change-Id: I4d7c7fbd530d1cc05679cdc4b7c044efb9d0ba40
Jan Althaus [Fri, 15 Sep 2017 19:45:22 +0000 (19:45 +0000)]
Merge "New metrics fields for selection logs" into oc-mr1-dev
am:
0fe3b1aa13
Change-Id: I09186a100a8a10d6713ae79b71e56ba75c6ffecb
Tony Mak [Fri, 15 Sep 2017 19:40:43 +0000 (19:40 +0000)]
Merge "getInstalledDialerApplications should not count ForwardIntentToParent" into oc-mr1-dev
am:
72befffcbc
Change-Id: Id711312d9bf0c6fe22cf93a166e533d9acf97452
TreeHugger Robot [Fri, 15 Sep 2017 19:31:22 +0000 (19:31 +0000)]
Merge "New metrics fields for selection logs" into oc-mr1-dev
TreeHugger Robot [Fri, 15 Sep 2017 19:30:46 +0000 (19:30 +0000)]
Merge "getInstalledDialerApplications should not count ForwardIntentToParent" into oc-mr1-dev
Tim Zheng [Fri, 15 Sep 2017 01:48:27 +0000 (18:48 -0700)]
BackupManagerService uses BackupManagerConstants.
This change update the backup manager service to use newly created
BackupManagerConstants for some configuration parameters.
This is part 2 of the change.
Test: Used 'adb logcat -b system' to verify the settings worked.
Bug:
63351792
Change-Id: Ia6c9a2afbbaf3481a742a67c48ce9995c1ce6483
Neil Fuller [Fri, 15 Sep 2017 18:31:18 +0000 (18:31 +0000)]
Merge "Fix a no-op uninstall being treated as a failure" into oc-mr1-dev am:
b6ccff73dd -s ours
am:
154dc85234 -s ours
Change-Id: I4936b5f67ee6c5bfcdb0be40730cc54db5a01b50
Neil Fuller [Fri, 15 Sep 2017 18:26:00 +0000 (18:26 +0000)]
Fix a no-op uninstall being treated as a failure am:
249b2e35a9 -s ours
am:
5c0d75acad -s ours
Change-Id: I45d6a707d56965a7c087a6435d3cd266ae86d90c
Neil Fuller [Fri, 15 Sep 2017 18:18:55 +0000 (18:18 +0000)]
Merge "Fix a no-op uninstall being treated as a failure" into oc-mr1-dev
am:
b6ccff73dd -s ours
Change-Id: I511fcbb0542459aca589f4ab2315b01508bbe707
Neil Fuller [Fri, 15 Sep 2017 18:14:27 +0000 (18:14 +0000)]
Fix a no-op uninstall being treated as a failure
am:
249b2e35a9 -s ours
Change-Id: I83404a077882a823e5ff63b70f47bba9435e9f57
Jorim Jaggi [Fri, 15 Sep 2017 18:13:30 +0000 (18:13 +0000)]
Merge "Don't take invisible screenshots" into oc-mr1-dev am:
6d9d42f6aa
am:
41fe2539f3
Change-Id: I75229cf1b8aafc7c8a933a9d2c7c6d4ac19e68d4
Selim Cinek [Fri, 15 Sep 2017 00:09:25 +0000 (17:09 -0700)]
Increased the text size for colorized notifications
Increased the text sizes a bit to make them more prominent.
Test: add colorized notifications of all styles
Change-Id: Ie22053edcb0297e7c3ee0c43b29cdd0e7b6a4516
Fixes:
35925915
Chris Tate [Fri, 15 Sep 2017 18:04:38 +0000 (18:04 +0000)]
Merge "Make sure that updated wallpaper id is immediate" into oc-mr1-dev am:
955bfb6e25
am:
a645aac5a7
Change-Id: If3cf6546dad093673b6e6fc234613c33d385fd19
Jorim Jaggi [Fri, 15 Sep 2017 18:02:50 +0000 (18:02 +0000)]
Merge "Don't take invisible screenshots" into oc-mr1-dev
am:
6d9d42f6aa
Change-Id: I983bb9c73c4cdb43aa0c6ef33748da2a68db0d28
Hall Liu [Fri, 15 Sep 2017 17:59:28 +0000 (17:59 +0000)]
Merge changes from topic "embms-cherry-pick-3" into oc-mr1-dev am:
b9d2b56c61 -s ours
am:
c98bf2f7f4
Change-Id: I2145da40b5bd1bfb3afcbe191f3651767ccc870d
Neil Fuller [Fri, 15 Sep 2017 17:56:16 +0000 (17:56 +0000)]
Merge "Fix a no-op uninstall being treated as a failure" into oc-mr1-dev
Chris Tate [Fri, 15 Sep 2017 17:55:13 +0000 (17:55 +0000)]
Merge "Make sure that updated wallpaper id is immediate" into oc-mr1-dev
am:
955bfb6e25
Change-Id: Ibfe8cdef80d78bc6ac7b915e55c16b25d978ce8e
TreeHugger Robot [Fri, 15 Sep 2017 17:55:06 +0000 (17:55 +0000)]
Merge "Disable flaky test testRemoveContainer_deferRemoval"
Hall Liu [Fri, 15 Sep 2017 17:51:22 +0000 (17:51 +0000)]
Merge changes from topic "embms-cherry-pick-3" into oc-mr1-dev
am:
b9d2b56c61 -s ours
Change-Id: I24d682a9c13a7b6e16bc2e265468947fbe8dd64a
TreeHugger Robot [Fri, 15 Sep 2017 17:50:51 +0000 (17:50 +0000)]
Merge "Don't take invisible screenshots" into oc-mr1-dev
Chris Tate [Fri, 15 Sep 2017 17:37:09 +0000 (17:37 +0000)]
Merge "Make sure that updated wallpaper id is immediate" into oc-mr1-dev
Hall Liu [Fri, 15 Sep 2017 17:17:38 +0000 (17:17 +0000)]
Merge changes from topic "embms-cherry-pick-3" into oc-mr1-dev
* changes:
API council suggested edits, part 3
Apply suggested edits to the file-download API
Make changes to MBMS Streaming APIs per recommendations
Neil Fuller [Fri, 15 Sep 2017 17:11:06 +0000 (17:11 +0000)]
Merge "Fix a no-op uninstall being treated as a failure" am:
fab8162abd am:
1157a7196b am:
9c60a8d3f1
am:
c648403c44 -s ours
Change-Id: Ib0521406251e6dbc0d13dcf1f7bc164e88acd1e8
Adam Lesinski [Fri, 15 Sep 2017 17:04:01 +0000 (17:04 +0000)]
Merge changes Id8bdb14e,I573a6735,Ia804777f,Ia68122cb,Ia1997800, ... into oc-mr1-dev am:
e02983681a
am:
e33de76a16 -s ours
Change-Id: I3d7f06be3a8cb42eb90bb5f76dc0261a85f5d258
Neil Fuller [Fri, 15 Sep 2017 17:02:03 +0000 (17:02 +0000)]
Merge "Fix a no-op uninstall being treated as a failure" am:
fab8162abd am:
1157a7196b
am:
9c60a8d3f1
Change-Id: I39ad444c735b5c11954700d5ae2ceaf74f747c4a
Adam Lesinski [Fri, 15 Sep 2017 16:57:21 +0000 (16:57 +0000)]
Merge changes Id8bdb14e,I573a6735,Ia804777f,Ia68122cb,Ia1997800, ... into oc-mr1-dev
am:
e02983681a
Change-Id: I42369e6fb7bd121e45b5a002cd5f00e05221ead3
Tenghui Zhu [Fri, 15 Sep 2017 16:55:56 +0000 (16:55 +0000)]
Merge "Add systrace for VectorDrawable inflation and draw"
Neil Fuller [Fri, 15 Sep 2017 16:53:24 +0000 (16:53 +0000)]
Merge "Fix a no-op uninstall being treated as a failure" am:
fab8162abd
am:
1157a7196b
Change-Id: I9f8a65fcb375678dc1290c155ec2c755fb5bfd62
OSDN Git Service
