OSDN Git Service
Nathan Harold [Wed, 12 Apr 2017 20:51:41 +0000 (20:51 +0000)]
IpSecManager and IpSecAlgorithm API Tweaks am:
6045429b35 am:
9c2428ad4d
am:
99c50add4f
Change-Id: I49641308cd0f2ce3e8a7545c8b03108d69287c64
Bill Yi [Wed, 12 Apr 2017 20:27:30 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
88ab6c1304 -s ours
Change-Id: I5f4ab216d538b793f1b9437a9e44320e2412b9cc
Bill Yi [Wed, 12 Apr 2017 20:19:34 +0000 (20:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Todd Kennedy [Wed, 12 Apr 2017 20:00:09 +0000 (20:00 +0000)]
Merge "Allow instant app resolution for any user" into oc-dev
am:
e7b806e9d2
Change-Id: Ic1dbc09e11aab6aacf66e0106274281534515b2d
Seigo Nonaka [Wed, 12 Apr 2017 19:55:52 +0000 (19:55 +0000)]
Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev
am:
1e924df63e
Change-Id: I484cd07fb67b40b54d7ad4b1ae7324a0d370ed6a
Jesse Evans [Wed, 12 Apr 2017 19:52:07 +0000 (19:52 +0000)]
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
am:
684b5381e9
Change-Id: I3be91519cbe8b7c3cef474923a30927504e68642
TreeHugger Robot [Wed, 12 Apr 2017 19:45:50 +0000 (19:45 +0000)]
Merge "Allow instant app resolution for any user" into oc-dev
Jaewan Kim [Wed, 12 Apr 2017 19:45:21 +0000 (19:45 +0000)]
Merge "Add documentation for 'am start-foreground-service'" into oc-dev
am:
e7ce1d40e1
Change-Id: I4202bc13102f35b8d3cd4b328c5a1de49b7cb08e
Seigo Nonaka [Wed, 12 Apr 2017 19:39:41 +0000 (19:39 +0000)]
Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 19:39:12 +0000 (19:39 +0000)]
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 19:37:22 +0000 (19:37 +0000)]
Merge "Add documentation for 'am start-foreground-service'" into oc-dev
Julia Reynolds [Wed, 12 Apr 2017 19:24:55 +0000 (19:24 +0000)]
Merge "Clear calling identity before verifying listeners" into oc-dev
am:
43dd3ba3c4
Change-Id: I05a728d069a06f4ec36dff79db022407f4d3504c
Casey Burkhardt [Wed, 12 Apr 2017 19:14:04 +0000 (19:14 +0000)]
Merge "Improved multiuser support for A11y button/Magnification" into oc-dev
am:
9aa64e6cfa
Change-Id: Ia7a56ce9ddc39d1e9e5d814d593dba96c95ae957
Julia Reynolds [Wed, 12 Apr 2017 19:13:01 +0000 (19:13 +0000)]
Merge "Clear calling identity before verifying listeners" into oc-dev
Casey Burkhardt [Wed, 12 Apr 2017 19:04:12 +0000 (19:04 +0000)]
Merge "Improved multiuser support for A11y button/Magnification" into oc-dev
Svet Ganov [Wed, 12 Apr 2017 19:03:26 +0000 (19:03 +0000)]
Merge "Fill UI polish" into oc-dev
am:
c9a83326c2
Change-Id: Iafae2e819d836a1bda463898695f2fbf9334299b
TreeHugger Robot [Wed, 12 Apr 2017 18:54:28 +0000 (18:54 +0000)]
Merge "Fill UI polish" into oc-dev
Kang Li [Wed, 12 Apr 2017 18:41:21 +0000 (18:41 +0000)]
Merge "Updates reportChooserSelection to be synchronized with queryUsageStats in UsageStatsService, to fix a flaky test." into oc-dev
am:
1f477fb270
Change-Id: Ibab9026c9330218e459091f5d53505a64c039ce8
Mady Mellor [Wed, 12 Apr 2017 18:40:12 +0000 (18:40 +0000)]
Merge "Don't offer snooze for foreground service notifications" into oc-dev
am:
8f395a16fb
Change-Id: Ieb5ea626ed2fb83a4959f85be097d0f5563e1471
Nathan Harold [Wed, 12 Apr 2017 18:37:23 +0000 (18:37 +0000)]
IpSecManager and IpSecAlgorithm API Tweaks am:
6045429b35
am:
9c2428ad4d
Change-Id: I6f7e2011a273d10386b72391d12a0ce55f18ffd7
Charles He [Wed, 12 Apr 2017 18:36:10 +0000 (18:36 +0000)]
Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev
am:
9f074e2224
Change-Id: Ie57c07ed9caee3ee66847cbedc4b10b79bcd9abe
TreeHugger Robot [Wed, 12 Apr 2017 18:33:18 +0000 (18:33 +0000)]
Merge "Updates reportChooserSelection to be synchronized with queryUsageStats in UsageStatsService, to fix a flaky test." into oc-dev
Mady Mellor [Wed, 12 Apr 2017 18:27:23 +0000 (18:27 +0000)]
Merge "Don't offer snooze for foreground service notifications" into oc-dev
Nathan Harold [Wed, 12 Apr 2017 18:27:09 +0000 (18:27 +0000)]
IpSecManager and IpSecAlgorithm API Tweaks
am:
6045429b35
Change-Id: I93d58f64834e5a4c7bc1bf03a5baf2eb5364a36d
Bill Yi [Wed, 12 Apr 2017 18:26:14 +0000 (18:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
2d1fb47916 -s ours
Change-Id: Ie7184d013593bad3c8b70974917236fd1717bd6a
Charles He [Wed, 12 Apr 2017 18:25:46 +0000 (18:25 +0000)]
Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev
Siyamed Sinir [Wed, 12 Apr 2017 18:17:57 +0000 (18:17 +0000)]
Merge "Do not enforce paragraph constraint for copy ctr" into oc-dev
am:
37bfd57ead
Change-Id: I9ccf940b5e2d47bbb29fcb12bea3c20d2ea9ae69
TreeHugger Robot [Wed, 12 Apr 2017 18:17:48 +0000 (18:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Siyamed Sinir [Wed, 12 Apr 2017 18:09:50 +0000 (18:09 +0000)]
Merge "Do not enforce paragraph constraint for copy ctr" into oc-dev
Dianne Hackborn [Wed, 12 Apr 2017 18:02:53 +0000 (18:02 +0000)]
Merge "Add new "work queue" feature to JobScheduler." into oc-dev
am:
0a0a63c8b1
Change-Id: I646a3a144833650f9ee7b9727f73ee78c7c82532
Powei Feng [Wed, 12 Apr 2017 18:01:12 +0000 (18:01 +0000)]
Merge "Revert "Transition from Activity to Broadcast for TV Search"" into oc-dev
am:
f63cb49b15
Change-Id: If3d06de8fcc60080b51bb367ddc37b3d924af0b3
Dianne Hackborn [Wed, 12 Apr 2017 17:55:49 +0000 (17:55 +0000)]
Merge "Add new "work queue" feature to JobScheduler." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 17:52:56 +0000 (17:52 +0000)]
Merge "Revert "Transition from Activity to Broadcast for TV Search"" into oc-dev
Derek Sollenberger [Wed, 12 Apr 2017 17:49:19 +0000 (17:49 +0000)]
Merge "Change behavior of setBitmap to cleanly reset the canvas" into oc-dev
am:
7944962b7e
Change-Id: Iced04463ac3e7f0ff696f2cf75dc064cf704863f
Seigo Nonaka [Wed, 12 Apr 2017 17:37:54 +0000 (17:37 +0000)]
Merge "Remove unused public APIs." into oc-dev
am:
feaa8b0f01
Change-Id: I7ffbb8a98d342f12304bb85ce45498790363703c
TreeHugger Robot [Wed, 12 Apr 2017 17:37:01 +0000 (17:37 +0000)]
Merge "Change behavior of setBitmap to cleanly reset the canvas" into oc-dev
Soonil Nagarkar [Wed, 12 Apr 2017 17:36:30 +0000 (17:36 +0000)]
Merge "Fix foreground importance bug in LocationManagerService." into oc-dev
am:
25a263a303
Change-Id: If35b625802224f7f1dbfb24d83e469093bdc718b
TreeHugger Robot [Wed, 12 Apr 2017 17:31:38 +0000 (17:31 +0000)]
Merge "Remove unused public APIs." into oc-dev
Soonil Nagarkar [Wed, 12 Apr 2017 17:27:40 +0000 (17:27 +0000)]
Merge "Fix foreground importance bug in LocationManagerService." into oc-dev
Dongwon Kang [Wed, 12 Apr 2017 17:19:53 +0000 (17:19 +0000)]
Merge "TIF: add review rating columns to programs" into oc-dev
am:
bf02434e79
Change-Id: Ia359606a44ce4f08b4460443f803c204845f2c3d
Jorim Jaggi [Wed, 12 Apr 2017 17:18:06 +0000 (17:18 +0000)]
Merge "Disallow task snapshot starting window for intent != ACTION_MAIN" into oc-dev
am:
fe99773a70
Change-Id: I88f17c51cb020ed30b771a1bebfa565640f262fc
Jorim Jaggi [Wed, 12 Apr 2017 17:16:44 +0000 (17:16 +0000)]
Merge "Fix NPE in TaskSnapshotController" into oc-dev
am:
6846676b9b
Change-Id: Id27ee1c5147bbceddf36c3159d6fbf654ab965f7
Jason Monk [Wed, 12 Apr 2017 17:15:25 +0000 (17:15 +0000)]
Merge "Updates for QS DND tile" into oc-dev
am:
88b8dc5211
Change-Id: I091681155cfc263598d9fd918873d7269d3eee32
Dongwon Kang [Wed, 12 Apr 2017 17:12:13 +0000 (17:12 +0000)]
Merge "TIF: add review rating columns to programs" into oc-dev
Jason Monk [Wed, 12 Apr 2017 17:12:04 +0000 (17:12 +0000)]
Merge "Visual changes to dual target tiles" into oc-dev
am:
ec9afcd4c5
Change-Id: I3efde6087bb26ec580e0f685fa11687d7ce48ae1
George Mount [Wed, 12 Apr 2017 17:09:32 +0000 (17:09 +0000)]
Merge "Ensure bounds are updated together." into oc-dev
am:
a968d33edb
Change-Id: I462a00824c15864a5f68cd9a647da68f9119aff0
Seigo Nonaka [Wed, 12 Apr 2017 17:07:53 +0000 (17:07 +0000)]
Merge "Introduce FILE_ID for TTC fonts and variation fonts." into oc-dev
am:
33aae89f29
Change-Id: I8398ce892052a0c3fd67560d3fab25ed15210ee4
Jorim Jaggi [Wed, 12 Apr 2017 17:06:10 +0000 (17:06 +0000)]
Merge "Disallow task snapshot starting window for intent != ACTION_MAIN" into oc-dev
Jorim Jaggi [Wed, 12 Apr 2017 17:04:07 +0000 (17:04 +0000)]
Merge "Fix NPE in TaskSnapshotController" into oc-dev
Jason Monk [Wed, 12 Apr 2017 17:00:34 +0000 (17:00 +0000)]
Merge "Updates for QS DND tile" into oc-dev
Jason Monk [Wed, 12 Apr 2017 16:59:56 +0000 (16:59 +0000)]
Merge "Visual changes to dual target tiles" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 16:59:28 +0000 (16:59 +0000)]
Merge "Ensure bounds are updated together." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 16:54:43 +0000 (16:54 +0000)]
Merge "Introduce FILE_ID for TTC fonts and variation fonts." into oc-dev
Svet Ganov [Wed, 12 Apr 2017 06:10:43 +0000 (23:10 -0700)]
Fill UI polish
1. Avoid jank when the suggesting list scrolled
2. Remove hard-coded values from max popup height
3. UX requested tweaks
4. Remove dead code
Test: manual
bug:
37245055
bug:
37179467
Change-Id: I6a6760edb06230e3d4925e23863667cfd3ac0601
Daniel Nishi [Wed, 12 Apr 2017 16:43:42 +0000 (16:43 +0000)]
Merge "Use the StorageStatsManager in FileCollector." into oc-dev
am:
feada91060
Change-Id: I11d4cd7a4acb384c3a4d134d55d8630de24ce533
Dmitri Plotnikov [Wed, 12 Apr 2017 16:42:30 +0000 (16:42 +0000)]
Merge "Fixing content intent on External Storage notification" into oc-dev
am:
5a667c8eb1
Change-Id: I903ee416c140438805289a946d568e20b9c5ca80
Daniel Nishi [Wed, 12 Apr 2017 16:37:47 +0000 (16:37 +0000)]
Merge "Use the StorageStatsManager in FileCollector." into oc-dev
Charles He [Wed, 12 Apr 2017 15:22:35 +0000 (16:22 +0100)]
Disallow direct-boot aware activities to bypass work lock
Effectively reverting
89927b3cd96472c478a988d6c731cd09d412a043, which
allowed direct-boot aware activities in the work profile to show before
the profile was unlocked. This causes problems with key eviction
introduced in O. Specifically, many system activities (e.g.
ChooserActivity, activities in Settings, etc.) are marked direct-boot
aware, and therefore can be started while the work profile is locked
with key evicted. Currently they either bypass the keyguard when they
should not, or simply crash due to profile still being locked.
In the future, we need to create a new mechanism to allow activities
such as video calls, alarm clocks, etc. to bypass the work keyguard. It
probably involves checking for something like FLAG_SHOW_WHEN_LOCKED.
Bug:
36961785
Bug:
35708183
Bug:
30296144
Test: manual, by following the steps in the bugs quoted
Test: runtest -c com.android.server.am.ActivityManagerServiceTest frameworks-services
Change-Id: I5ccaaf963f3dd96e4abb785a10aa258b15363178
Dmitri Plotnikov [Wed, 12 Apr 2017 16:34:27 +0000 (16:34 +0000)]
Merge "Fixing content intent on External Storage notification" into oc-dev
Russell Brenner [Wed, 12 Apr 2017 16:15:25 +0000 (16:15 +0000)]
Merge "Add hidden SystemApi for two setup wizard actions" into oc-dev
am:
27ce8b0d34
Change-Id: If690b190990b1ca49a5efbc1994b8b09b332630e
Julia Reynolds [Wed, 12 Apr 2017 13:41:16 +0000 (09:41 -0400)]
Clear calling identity before verifying listeners
Also don't throw when can't verify listener.
And update mocking in tests to clean state between tests.
Bug:
36783632
Fixes:
37263567
Test: runtest-systemui-notification, create a secondary user
Change-Id: I5ec95539c9859b67b8fbc7e6a85334e08e6b5a98
TreeHugger Robot [Wed, 12 Apr 2017 16:07:22 +0000 (16:07 +0000)]
Merge "Add hidden SystemApi for two setup wizard actions" into oc-dev
Kang Li [Sat, 25 Feb 2017 01:41:07 +0000 (17:41 -0800)]
Updates reportChooserSelection to be synchronized with queryUsageStats
in UsageStatsService, to fix a flaky test.
Bug:
35763877
Test: manually ran the flaky tests for 50 times, to verify that it is
stable.
Change-Id: I56d355bb283275f33bf7a24d0cc5b6454b99a35e
(cherry picked from commit
434f76a8d739060b5c8e96b4824687c19b94ee79)
Jean-Michel Trivi [Wed, 12 Apr 2017 15:55:12 +0000 (15:55 +0000)]
Merge "VolumeShaper: update API, use "Millis" instead of "Ms"" into oc-dev
am:
170e3e242b
Change-Id: Ie4784a0933e5113b8069da09683a13f4166bc87e
Robert Greenwalt [Wed, 12 Apr 2017 15:49:19 +0000 (15:49 +0000)]
Merge "Adding 20 free short codes for DCB and other purposes" am:
70fea2df2a am:
03f9a489cb
am:
7c1460f388
Change-Id: I3f7e26ff002616ebc642f7358e846e7bf093437c
Jean-Michel Trivi [Wed, 12 Apr 2017 15:45:49 +0000 (15:45 +0000)]
Merge "VolumeShaper: update API, use "Millis" instead of "Ms"" into oc-dev
Mady Mellor [Wed, 12 Apr 2017 15:38:04 +0000 (15:38 +0000)]
Merge "Show x for short period of time when activity is PIP'd" into oc-dev
am:
56069d7146
Change-Id: I9c3263bd91e377b4342ab8184444e5230eeab511
Robert Greenwalt [Wed, 12 Apr 2017 15:37:53 +0000 (15:37 +0000)]
Merge "Adding 20 free short codes for DCB and other purposes" am:
70fea2df2a
am:
03f9a489cb
Change-Id: Ic4915213105ba31c63d97187297c652a477e99df
Mady Mellor [Wed, 12 Apr 2017 15:32:26 +0000 (15:32 +0000)]
Merge "Show x for short period of time when activity is PIP'd" into oc-dev
Robert Greenwalt [Wed, 12 Apr 2017 15:27:23 +0000 (15:27 +0000)]
Merge "Adding 20 free short codes for DCB and other purposes"
am:
70fea2df2a
Change-Id: Ic63e088d49796b6e98dc92bc3b0b261958d73e8c
Paul Mclean [Wed, 12 Apr 2017 15:27:20 +0000 (15:27 +0000)]
Merge "Optimize HW_AV_SYNC playback by avoiding multiple timestamp block allocations." into oc-dev
am:
e0e55f535a
Change-Id: I8fb4d8f1a1d237aa28780f6f419b9a8fd6131a06
Paul Mclean [Wed, 12 Apr 2017 15:16:17 +0000 (15:16 +0000)]
Merge "Optimize HW_AV_SYNC playback by avoiding multiple timestamp block allocations." into oc-dev
Robert Greenwalt [Wed, 12 Apr 2017 15:15:32 +0000 (15:15 +0000)]
Merge "Adding 20 free short codes for DCB and other purposes"
Mark Salyzyn [Wed, 12 Apr 2017 14:55:26 +0000 (14:55 +0000)]
Merge "jni: isLoggable: adapt to removal of property name size limit" into oc-dev
am:
b4b44d3bae
Change-Id: Ia548ce29efe31da1fc207cc32ca887468245b88c
Mark Salyzyn [Wed, 12 Apr 2017 14:49:12 +0000 (14:49 +0000)]
Merge "jni: isLoggable: adapt to removal of property name size limit" into oc-dev
Seigo Nonaka [Mon, 10 Apr 2017 18:03:24 +0000 (11:03 -0700)]
Introduce FILE_ID for TTC fonts and variation fonts.
A single TTC font or variation font can be used for multiple entry
of FontResult. To share the file contents, assign same URI for those.
Bug:
36494487
Test: android.provider.FontsContractTest passes
Change-Id: Ibf24f216179a6481dee1801cd2dfb68c4bb38fac
Michael Wright [Wed, 12 Apr 2017 14:23:20 +0000 (14:23 +0000)]
Merge "Always request keyboard shorcuts, even if there's no menu." into oc-dev
am:
7ecd40c1fc
Change-Id: I003b2cfcdb10a4d9c999ba9cd575561bf7b70086
TreeHugger Robot [Wed, 12 Apr 2017 14:16:04 +0000 (14:16 +0000)]
Merge "Always request keyboard shorcuts, even if there's no menu." into oc-dev
Seigo Nonaka [Tue, 11 Apr 2017 17:40:55 +0000 (10:40 -0700)]
Update Typeface.Builder API to reflect API feedback.
- Stop pooling and remove reset method.
- Introduce overloaded constructors instead of setSource methods.
- Make italic parameter boolean and treat "not called" as
RESOLVE_BY_FONT_TABLE.
- Remove constants and move them to Typeface with private static
constant.
- Fix JavaDoc.
Bug:
37082657
Test: android.graphics.cts.TypefaceTest passed
Change-Id: I0c50cf3e2d50c0021f7e12bbb7ed7ae89fa1c2a1
Jesse Evans [Fri, 7 Apr 2017 23:11:26 +0000 (16:11 -0700)]
Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED
Renames the instant apps setting to reflect what it is for.
Adds the SystemApi annotation to make this field visible
to the resolver and installer.
Test: existing tests
Change-Id: I1651bb101d69bdfdaa63c004435025c68a33cd8e
Pavel Grafov [Wed, 12 Apr 2017 12:42:16 +0000 (12:42 +0000)]
Merge "Improve javadocs for SecurityLog class." into oc-dev
am:
a9a2bbc647
Change-Id: I7b6b3d6aa1d27cc09a094b3b01fd6530a2d2ed6c
Pavel Grafov [Wed, 12 Apr 2017 12:33:48 +0000 (12:33 +0000)]
Merge "Improve javadocs for SecurityLog class." into oc-dev
Johan Toras Halseth [Wed, 12 Apr 2017 11:06:40 +0000 (11:06 +0000)]
Merge "Add helptext to bu command." into oc-dev
am:
487e10e22b
Change-Id: Id39d64a9634ed91826f6898e97bdbc213ce111a0
TreeHugger Robot [Wed, 12 Apr 2017 10:59:53 +0000 (10:59 +0000)]
Merge "Add helptext to bu command." into oc-dev
Hugo Benichi [Wed, 12 Apr 2017 10:00:32 +0000 (10:00 +0000)]
Merge "Captive portal: fix probe urls at network creation" am:
923ef69ae7 am:
65fa0676bf
am:
4c63d86db7
Change-Id: Iffc7ff461b685f14ced20ac0cd186f31aa4061ad
Hugo Benichi [Wed, 12 Apr 2017 09:55:06 +0000 (09:55 +0000)]
Merge "Captive portal: fix probe urls at network creation" am:
923ef69ae7
am:
65fa0676bf
Change-Id: I3f4e5e226d6a6371a6fed02d472d1cad4995c64a
Philip P. Moltmann [Wed, 12 Apr 2017 09:50:07 +0000 (09:50 +0000)]
Merge "Do not inset autofill highlight" into oc-dev
am:
ac1c224cdc
Change-Id: I8e37f008c016d25077fe690477422fd4e7422f29
Hugo Benichi [Wed, 12 Apr 2017 09:50:05 +0000 (09:50 +0000)]
Merge "Captive portal: fix probe urls at network creation"
am:
923ef69ae7
Change-Id: I82eb06ee1f9d69a1a3ccb5208947bdfcdbba6d81
Kevin Chyn [Wed, 12 Apr 2017 09:45:43 +0000 (09:45 +0000)]
Merge "Implement enumerate in FingerprintService" into oc-dev
am:
c2f8949b32
Change-Id: Iae38c3a036374d5556f1020cd3fd472b5e7c819f
TreeHugger Robot [Wed, 12 Apr 2017 09:43:06 +0000 (09:43 +0000)]
Merge "Do not inset autofill highlight" into oc-dev
Treehugger Robot [Wed, 12 Apr 2017 09:38:40 +0000 (09:38 +0000)]
Merge "Captive portal: fix probe urls at network creation"
TreeHugger Robot [Wed, 12 Apr 2017 09:35:12 +0000 (09:35 +0000)]
Merge "Implement enumerate in FingerprintService" into oc-dev
Abodunrinwa Toki [Wed, 12 Apr 2017 09:17:33 +0000 (09:17 +0000)]
Merge "Make "Paste as plain text" resource string public." into oc-dev
am:
7d4cf66b17
Change-Id: I6be7e69dd5b172215494a2736bb7e91e36d7b09c
Hyunyoung Song [Wed, 12 Apr 2017 09:12:32 +0000 (09:12 +0000)]
Merge "Change AOSP launcher icon mask Test: manual b/
36854903" into oc-dev
am:
264f2e40e2
Change-Id: I702c3b790d6b5c0abb9cbc65cdf4e5bfb2b527d9
TreeHugger Robot [Wed, 12 Apr 2017 09:12:19 +0000 (09:12 +0000)]
Merge "Make "Paste as plain text" resource string public." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 09:02:10 +0000 (09:02 +0000)]
Merge "Change AOSP launcher icon mask Test: manual b/
36854903" into oc-dev
Jorim Jaggi [Wed, 12 Apr 2017 05:18:45 +0000 (05:18 +0000)]
Merge "Fix doc for FLAG_DISMISS_KEYGUARD" into oc-dev
am:
39608b8556
Change-Id: I73dad3226b72bc2b76034c42a77e25be75685a29
TreeHugger Robot [Wed, 12 Apr 2017 05:10:59 +0000 (05:10 +0000)]
Merge "Fix doc for FLAG_DISMISS_KEYGUARD" into oc-dev
Suprabh Shukla [Wed, 12 Apr 2017 04:45:31 +0000 (04:45 +0000)]
Merge "Renaming intent action for unknown sources" into oc-dev
am:
a609bbc9c4
Change-Id: I67e378a818d5fb74e602a32c67eb3299adf36549
Suprabh Shukla [Wed, 12 Apr 2017 04:32:45 +0000 (04:32 +0000)]
Merge "Renaming intent action for unknown sources" into oc-dev
OSDN Git Service
