OSDN Git Service
Sam Lin [Wed, 5 Apr 2017 01:37:26 +0000 (01:37 +0000)]
Merge "Add a feature flag for CTS." into oc-dev
am:
9ff3ec4872
Change-Id: I1b2e8026cf2db083fb17ab03d0e1972addffdbbb
Sam Lin [Wed, 5 Apr 2017 01:29:15 +0000 (01:29 +0000)]
Merge "Add a feature flag for CTS." into oc-dev
Mathias Agopian [Wed, 5 Apr 2017 00:52:39 +0000 (00:52 +0000)]
Merge "Remove useless GraphicBuffer() constructor" into oc-dev
am:
810e018e24
Change-Id: I630b623bc188301bc65e865f0298031ed9425cec
Adam Powell [Wed, 5 Apr 2017 00:50:12 +0000 (00:50 +0000)]
Merge "Don't crash when passing null to requestChildFocus" into oc-dev
am:
df50b64860
Change-Id: I77afb7ee544c08cdc927b0b2e66aa3f229a72892
Todd Kennedy [Wed, 5 Apr 2017 00:45:56 +0000 (00:45 +0000)]
Merge "Don't broadcast PACKAGE_REMOVED for InstantApps" into oc-dev
am:
b28e1e68d2
Change-Id: Id73d7aa14cbb20fe335270fbd2f05a8ed5606eb9
Mathias Agopian [Wed, 5 Apr 2017 00:42:52 +0000 (00:42 +0000)]
Merge "Remove useless GraphicBuffer() constructor" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 00:42:34 +0000 (00:42 +0000)]
Merge "Don't crash when passing null to requestChildFocus" into oc-dev
Hall Liu [Wed, 5 Apr 2017 00:40:22 +0000 (00:40 +0000)]
Merge "Add @TestApi annotations to CS-side RTT APIs for CTS" am:
f6f3c16dfb am:
6689b57b66
am:
bd2cf664ca
Change-Id: I22bd2201b0cc2b3bcbf8d1eb740a91485735d03f
TreeHugger Robot [Wed, 5 Apr 2017 00:37:48 +0000 (00:37 +0000)]
Merge "Don't broadcast PACKAGE_REMOVED for InstantApps" into oc-dev
Keun-young Park [Wed, 5 Apr 2017 00:34:19 +0000 (00:34 +0000)]
Merge "show different timing log for shutdown animation" into oc-dev
am:
0e59ab0408
Change-Id: If511a7732730cc3a15c21ab716083417d9d46728
TreeHugger Robot [Wed, 5 Apr 2017 00:29:55 +0000 (00:29 +0000)]
Merge "show different timing log for shutdown animation" into oc-dev
Chen Xu [Tue, 4 Apr 2017 23:49:02 +0000 (23:49 +0000)]
Merge "move ACTION_SERVICE_STATE to system api" into oc-dev
am:
5effb5f645
Change-Id: I5b61b20b646a9bfae4e0f89c70f7af71f626c740
Hall Liu [Tue, 4 Apr 2017 23:45:39 +0000 (23:45 +0000)]
Merge "Add @TestApi annotations to CS-side RTT APIs for CTS" am:
f6f3c16dfb
am:
6689b57b66
Change-Id: I35ec391a2edcc4d64bc7330415505f700b90a568
Adrian Roos [Tue, 4 Apr 2017 23:44:39 +0000 (23:44 +0000)]
Merge "AOD: update AOD2 views to spec" into oc-dev
am:
146293b35c
Change-Id: I383dae263347ea0719bbbb8af07e6d0a665aee27
Chen Xu [Tue, 4 Apr 2017 23:43:51 +0000 (23:43 +0000)]
Merge "move ACTION_SERVICE_STATE to system api" into oc-dev
Adrian Roos [Tue, 4 Apr 2017 23:38:38 +0000 (23:38 +0000)]
Merge "AOD: update AOD2 views to spec" into oc-dev
Hall Liu [Tue, 4 Apr 2017 23:38:39 +0000 (23:38 +0000)]
Merge "Add @TestApi annotations to CS-side RTT APIs for CTS"
am:
f6f3c16dfb
Change-Id: I510ed2b8dfdbbb3563cd31c8630973790eae023d
Hall Liu [Tue, 4 Apr 2017 23:31:37 +0000 (23:31 +0000)]
Merge "Add @TestApi annotations to CS-side RTT APIs for CTS"
Jeff Sharkey [Tue, 4 Apr 2017 23:29:44 +0000 (23:29 +0000)]
Merge "Just round up the data partition size." into oc-dev
am:
edcbf28b7c
Change-Id: I2003f048cc83cfebcf4950734b586483497fae67
TreeHugger Robot [Tue, 4 Apr 2017 23:23:30 +0000 (23:23 +0000)]
Merge "Just round up the data partition size." into oc-dev
Jeff Sharkey [Tue, 4 Apr 2017 22:48:24 +0000 (22:48 +0000)]
Merge "Add legacy DownloadManager actions to SystemApi." into oc-dev
am:
cd77661682
Change-Id: I8ce4e00a78c4ac4b3ffd783bccee10855fa19df0
Winson Chung [Tue, 4 Apr 2017 22:47:22 +0000 (22:47 +0000)]
Merge "Catching additional case where menu would disappear in accessibility." into oc-dev
am:
6a9f4a997c
Change-Id: I1473f065885e599cb04e045f0096826ed02f417f
Todd Kennedy [Tue, 4 Apr 2017 22:46:15 +0000 (22:46 +0000)]
Merge "Change name of the intent fields" into oc-dev
am:
5379b05256
Change-Id: Iad6fe0e4e64820fafd3bfbfb0d721293d03784cf
Adam Powell [Tue, 4 Apr 2017 22:33:23 +0000 (15:33 -0700)]
Don't crash when passing null to requestChildFocus
Add null checks to ScrollView and HorizontalScrollView for checking
the revealOnFocusHint. This should never happen in code called by
the framework, but some apps were hitting it.
Bug:
36379645
Test: none
Change-Id: I220eb88d82126ff08f47a7c2a7fbdddebf07de81
TreeHugger Robot [Tue, 4 Apr 2017 22:42:05 +0000 (22:42 +0000)]
Merge "Add legacy DownloadManager actions to SystemApi." into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 22:39:39 +0000 (22:39 +0000)]
Merge "Catching additional case where menu would disappear in accessibility." into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 22:38:57 +0000 (22:38 +0000)]
Merge "Change name of the intent fields" into oc-dev
Stan Iliev [Tue, 4 Apr 2017 22:29:36 +0000 (22:29 +0000)]
Merge "Fix pop-up shadow drawn in the wrong place with Skia pipeline" into oc-dev
am:
a5c6ba3473
Change-Id: If6f000705c2d7ca63ea8397a26242ef986e34e39
TreeHugger Robot [Tue, 4 Apr 2017 22:22:57 +0000 (22:22 +0000)]
Merge "Fix pop-up shadow drawn in the wrong place with Skia pipeline" into oc-dev
Keun-young Park [Tue, 4 Apr 2017 19:21:19 +0000 (12:21 -0700)]
show different timing log for shutdown animation
bug:
36873098
Test: reboot and check log
Change-Id: Ic3adaba383cc29dba039a7fb5adcb01d4c0c963b
Todd Kennedy [Tue, 4 Apr 2017 14:33:34 +0000 (07:33 -0700)]
Don't broadcast PACKAGE_REMOVED for InstantApps
Change-Id: I7f054bbf844ad6c1b9a8aa20c5ba91cbf9a5db04
Fixes:
36444594
Test: Manual; uninstall AIA and see that the broadcast isn't sent
Seigo Nonaka [Tue, 4 Apr 2017 22:17:12 +0000 (22:17 +0000)]
Merge "Need to return false if addSkTypeface fails." into oc-dev
am:
46f847fb76
Change-Id: I25fa1e54a66c3f84dab8f50914fe3da6f368e19e
TreeHugger Robot [Tue, 4 Apr 2017 22:11:28 +0000 (22:11 +0000)]
Merge "Need to return false if addSkTypeface fails." into oc-dev
Android Build Merger (Role) [Tue, 4 Apr 2017 21:54:21 +0000 (21:54 +0000)]
Merge "Merge "Add api to retrieve call creation time." am:
f19c52d20d am:
777adc636b am:
eee4d5157a" into oc-dev-plus-aosp
Tyler Gunn [Tue, 4 Apr 2017 21:53:01 +0000 (21:53 +0000)]
Merge "Add api to retrieve call creation time." am:
f19c52d20d am:
777adc636b
am:
eee4d5157a
Change-Id: I9af3abdb0cf76b4e70547b1c58732fef3e07f86b
Felipe Leme [Tue, 4 Apr 2017 21:49:45 +0000 (21:49 +0000)]
Merge "Initial implementation of autofill partitioning." into oc-dev
am:
ba2e284a62
Change-Id: I245fc0402f526f2e1ad512c3df5f885856193c5c
Tyler Gunn [Tue, 4 Apr 2017 21:47:51 +0000 (21:47 +0000)]
Merge "Add api to retrieve call creation time." am:
f19c52d20d
am:
777adc636b
Change-Id: I6de08d4ac661f097181835b16c5e20a801787814
TreeHugger Robot [Tue, 4 Apr 2017 21:42:48 +0000 (21:42 +0000)]
Merge "Initial implementation of autofill partitioning." into oc-dev
Tyler Gunn [Tue, 4 Apr 2017 21:42:14 +0000 (21:42 +0000)]
Merge "Add api to retrieve call creation time."
am:
f19c52d20d
Change-Id: I42313561c2d4e612feb428f79a64c10a64bf011a
Hall Liu [Tue, 4 Apr 2017 21:37:53 +0000 (21:37 +0000)]
Merge "IMS: RTT interface changes" am:
814fdf9312 am:
bc56b97770
am:
7d1712e5b9
Change-Id: Ia5c6a16a69c71cfd96479e8df403669d5aaff6f9
Tyler Gunn [Tue, 4 Apr 2017 21:35:26 +0000 (21:35 +0000)]
Merge "Add api to retrieve call creation time."
Hall Liu [Tue, 4 Apr 2017 21:31:41 +0000 (21:31 +0000)]
Merge "IMS: RTT interface changes" am:
814fdf9312
am:
bc56b97770
Change-Id: Ia4f93347b8bcc668344ce78055c17a691dad4237
Miao Wang [Tue, 4 Apr 2017 21:30:45 +0000 (21:30 +0000)]
Merge "[RenderScript] Connect ANativeWindow to BufferQueue before calling AllocationSetSurface." into oc-dev
am:
8788f64b8d
Change-Id: If4033d7c453446d32124ca67246b371817c56772
Hall Liu [Tue, 4 Apr 2017 21:28:10 +0000 (21:28 +0000)]
Merge "IMS: RTT interface changes"
am:
814fdf9312
Change-Id: Ifecb02604cebdd5ae1a16d996940d11bee920ea8
fionaxu [Fri, 31 Mar 2017 19:45:12 +0000 (12:45 -0700)]
move ACTION_SERVICE_STATE to system api
As per CDD: The "android.*" namespace for intent constants is reserved
for public
Android API in AOSP. (Whether public to the full SDK, @SystemApi or
defined in AOSP support libraries.)
ACTION_SERVICE_STATE intent is generally useful for system/oem
apps thus move to system api
Bug:
33679956
Test: Manual
Change-Id: Ie38b53f077e8a013351d35387f9133e0ebb26cc9
TreeHugger Robot [Tue, 4 Apr 2017 21:26:13 +0000 (21:26 +0000)]
Merge "[RenderScript] Connect ANativeWindow to BufferQueue before calling AllocationSetSurface." into oc-dev
Jeff Sharkey [Tue, 4 Apr 2017 21:25:36 +0000 (21:25 +0000)]
Merge "Offer to "fixup" GIDs used for app data." into oc-dev
am:
359ce10912
Change-Id: I4a15ad2c025728313f6024dec9a49e6dfff1ac68
Sam Lin [Tue, 4 Apr 2017 03:57:45 +0000 (20:57 -0700)]
Add a feature flag for CTS.
Bug:
36599543
Test: Build sailfish and CTS
Test: run cts -o -m CtsAppTestCases -t android.app.cts.SystemFeaturesTest#testFeatureNamespaces
Change-Id: I659ddbe7d6e2d8762d97b8a418cfc246f7a97a3e
Hall Liu [Tue, 4 Apr 2017 21:21:16 +0000 (21:21 +0000)]
Merge "IMS: RTT interface changes"
TreeHugger Robot [Tue, 4 Apr 2017 21:18:16 +0000 (21:18 +0000)]
Merge "Offer to "fixup" GIDs used for app data." into oc-dev
Hiroki Yamamoto [Tue, 4 Apr 2017 21:13:42 +0000 (21:13 +0000)]
Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast" am:
4df6c75b99 am:
d0be609210
am:
d98be4a456
Change-Id: Ideac6fbfb6638e43ef499ff75a804295457e7c50
Jeff Sharkey [Tue, 4 Apr 2017 21:09:58 +0000 (15:09 -0600)]
Just round up the data partition size.
Instead of trying to be clever by poking at underlying flash part
sizes, rely on the fact that device storage printed on retail
packaging is a power-of-two value.
For a typical device with a 23GiB data partition, this will return
a value of "32GB" which matches the retail packaging.
Test: builds, boots
Bug:
34827187
Change-Id: Ib4cf7f637dffc9238252e1fedcd86dc8b5cf656d
Hiroki Yamamoto [Tue, 4 Apr 2017 21:09:39 +0000 (21:09 +0000)]
Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast" am:
4df6c75b99
am:
d0be609210
Change-Id: I8dd81fe9b4bb71b856a023c99594568d0442837c
Hiroki Yamamoto [Tue, 4 Apr 2017 21:05:41 +0000 (21:05 +0000)]
Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast"
am:
4df6c75b99
Change-Id: If1803f92474fbb6a3dc4aa47674e547443942440
Treehugger Robot [Tue, 4 Apr 2017 20:57:53 +0000 (20:57 +0000)]
Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast"
Hiroki Yamamoto [Tue, 28 Mar 2017 02:45:13 +0000 (11:45 +0900)]
Protect CANCEL_HANDOVER_TRANSFER broadcast
Bug:
36662809
Test: cancel AndroidBeam and check if the error log is not shown
Change-Id: Ic442753aacf97f7f5a7e449685c2b1414e77e957
Fyodor Kupolov [Tue, 4 Apr 2017 20:45:03 +0000 (20:45 +0000)]
Merge "Dump PackageInstaller state outside of mPackages lock" into oc-dev
am:
2b285566a4
Change-Id: I92ba7cbdf8a8bf533e37d3f8d080d083e951cf65
TreeHugger Robot [Tue, 4 Apr 2017 20:40:43 +0000 (20:40 +0000)]
Merge "Dump PackageInstaller state outside of mPackages lock" into oc-dev
Jeff Sharkey [Tue, 4 Apr 2017 20:38:39 +0000 (14:38 -0600)]
Add legacy DownloadManager actions to SystemApi.
They're still used by at least one bundled app.
Test: builds, boots
Bug:
35256608
Change-Id: I45966b3e0ed506ead4544bbbfc9d82b7f9d5205d
Tony Mantler [Tue, 4 Apr 2017 20:38:07 +0000 (20:38 +0000)]
Merge "Add AvailableVirtualKeyboardFragment to TV" into oc-dev
am:
56a090bf37
Change-Id: I973fa6ec82f5b45c0b516743da9111891a2cb348
Todd Kennedy [Tue, 4 Apr 2017 20:34:32 +0000 (20:34 +0000)]
Merge "rebind if the connection drops" into oc-dev
am:
dff13a0bb1
Change-Id: I4cb5542b28829d9f8dfe6989d37610c733a6457b
Todd Kennedy [Mon, 3 Apr 2017 22:22:38 +0000 (15:22 -0700)]
Change name of the intent fields
Change-Id: I67d3f5c7fb3189fdb35908011e92cc82c24b9154
Fixes:
36594944
Test: cts-tradefed run commandAndExit cts-dev -m CtsSignatureTestCases -t android.signature.cts.IntentTest#shouldNotFindUnexpectedIntents
TreeHugger Robot [Tue, 4 Apr 2017 20:31:41 +0000 (20:31 +0000)]
Merge "Add AvailableVirtualKeyboardFragment to TV" into oc-dev
Stan Iliev [Tue, 4 Apr 2017 19:23:54 +0000 (15:23 -0400)]
Fix pop-up shadow drawn in the wrong place with Skia pipeline
Fix a bug in DrawShadow matrix calculation. Recorded matrix does
not need to be applied, because parent display lists have already
replayed matrix transformations.
Test: added a new HWUI unit test that is passing only after this fix
Bug:
33103723
Change-Id: I7a47dbe879df6b9e5920a47c0e1168d9902a3e70
TreeHugger Robot [Tue, 4 Apr 2017 20:23:31 +0000 (20:23 +0000)]
Merge "rebind if the connection drops" into oc-dev
Adrian Roos [Thu, 16 Mar 2017 22:17:57 +0000 (15:17 -0700)]
AOD: update AOD2 views to spec
- Increase notification header size
- Dim clock in AOD2
- Hide shelf in AOD2
Bug:
30876804
Test: manual
Change-Id: I272ff54bd0dbed0ae4271c922f62304401651fc9
Michael Wright [Tue, 4 Apr 2017 20:03:40 +0000 (20:03 +0000)]
Merge "Make shutdown use the UI context." into oc-dev
am:
5879d28f4d
Change-Id: I51e92495a3c8b98357f82b5dea83608ea36aabc0
Evan Rosky [Tue, 4 Apr 2017 19:54:02 +0000 (19:54 +0000)]
Merge "More finishing-up of cluster implementation" into oc-dev
am:
baa9a3f4b9
Change-Id: Iedba1beb89d3d5fb7aa5ea8b6361e7c346521d37
TreeHugger Robot [Tue, 4 Apr 2017 19:52:05 +0000 (19:52 +0000)]
Merge "Make shutdown use the UI context." into oc-dev
Evan Rosky [Tue, 4 Apr 2017 19:47:05 +0000 (19:47 +0000)]
Merge "More finishing-up of cluster implementation" into oc-dev
Jeremy Joslin [Tue, 4 Apr 2017 19:45:33 +0000 (19:45 +0000)]
Merge "Migrate the NETWORK_SCORER_APP Setting." into oc-dev
am:
0bbde28dd4
Change-Id: I2a7f903bf824ca057a52a0a5c02873c5d154ec0c
Selim Gurun [Tue, 4 Apr 2017 19:39:16 +0000 (19:39 +0000)]
Merge "Disable WebView autocomplete feature." into oc-dev
am:
dd7414a644
Change-Id: I7ca639fbafb543dba5d226de3b66e7d90d22da89
TreeHugger Robot [Tue, 4 Apr 2017 19:37:16 +0000 (19:37 +0000)]
Merge "Migrate the NETWORK_SCORER_APP Setting." into oc-dev
Dongwon Kang [Tue, 4 Apr 2017 19:33:33 +0000 (19:33 +0000)]
Merge "TIF: hide BaseProgramColumns and BasePreviewColumns" into oc-dev
am:
8d84e4cd1c
Change-Id: If9ffaf1fd87e3cbc75da01c28142797e58d1cc7f
Adam Lesinski [Tue, 4 Apr 2017 19:32:25 +0000 (19:32 +0000)]
Merge "AAPT2: Allow multiple -c flags" into oc-dev
am:
7a7e415967
Change-Id: Ifbe2a96da8bc56b052fff69ec4ea8489be1106b3
TreeHugger Robot [Tue, 4 Apr 2017 19:31:47 +0000 (19:31 +0000)]
Merge "Disable WebView autocomplete feature." into oc-dev
Jean-Michel Trivi [Tue, 4 Apr 2017 19:31:13 +0000 (19:31 +0000)]
Merge "Revert "AudioAttributes: remove static getVolumeControlStream method"" into oc-dev
am:
6cf445bd3d
Change-Id: Ia8cd7ef85f4577aea668335396ec27533615b3d7
TreeHugger Robot [Tue, 4 Apr 2017 19:23:21 +0000 (19:23 +0000)]
Merge "TIF: hide BaseProgramColumns and BasePreviewColumns" into oc-dev
Derek Sollenberger [Tue, 4 Apr 2017 19:21:50 +0000 (19:21 +0000)]
Merge "Fix HWUI/Skia Gradients to premultiply the colors prior to interpolation" into oc-dev
am:
f9340ca491
Change-Id: I0dc8a4fec244b71256af54c65791ba75e730f087
Alan Viverette [Tue, 4 Apr 2017 19:19:06 +0000 (19:19 +0000)]
Merge "Refresh opacity and statefulness on tint change" into oc-dev
am:
8f6b9d8058
Change-Id: Icf83c65990d354e10e3f0a454dcb793cbd592fe7
TreeHugger Robot [Tue, 4 Apr 2017 19:14:43 +0000 (19:14 +0000)]
Merge "AAPT2: Allow multiple -c flags" into oc-dev
Jean-Michel Trivi [Tue, 4 Apr 2017 19:08:33 +0000 (19:08 +0000)]
Merge "Revert "AudioAttributes: remove static getVolumeControlStream method"" into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 19:06:28 +0000 (19:06 +0000)]
Merge "Fix HWUI/Skia Gradients to premultiply the colors prior to interpolation" into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 19:04:56 +0000 (19:04 +0000)]
Merge "Refresh opacity and statefulness on tint change" into oc-dev
Winson Chung [Tue, 4 Apr 2017 18:57:36 +0000 (11:57 -0700)]
Catching additional case where menu would disappear in accessibility.
- When showing the menu via accessibility it will stay on screen until
the user focuses away, but exploring via talkback still sends
onUserInteraction() callbacks which would post it anew. We need to
save the timeout state whenever the menu is shown and check it there
as well.
Bug:
36103023
Test: Enter PIP with talk back, touch button but don't do anything for
the timeout (~4s), verify menu does not close.
Change-Id: I03ce14531fcde84440122bfb0fc70899f5178d5b
Jason Monk [Tue, 4 Apr 2017 19:00:46 +0000 (19:00 +0000)]
Merge "Temporary fix for themes" into oc-dev
am:
02e5b5c6da
Change-Id: I15a2861696d4bc163107d4d7dd18fbce7c363b27
Jeff Hao [Tue, 4 Apr 2017 18:59:37 +0000 (18:59 +0000)]
Merge "Fix PackageManagerService passing usesLibraryFiles to dexOpt." into oc-dev
am:
765a1b7857
Change-Id: I3b0f0c8933066e63e09effd53ee6cfe2c287ec6e
George Mount [Tue, 4 Apr 2017 18:55:21 +0000 (18:55 +0000)]
Merge "Fix saving target fragment when Fragment not yet created." into oc-dev
am:
a16859114d
Change-Id: Ia61f383eba7639a3c29fcf4a13b53177141e65d2
TreeHugger Robot [Tue, 4 Apr 2017 18:53:02 +0000 (18:53 +0000)]
Merge "Temporary fix for themes" into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 18:52:04 +0000 (18:52 +0000)]
Merge "Fix PackageManagerService passing usesLibraryFiles to dexOpt." into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 18:45:12 +0000 (18:45 +0000)]
Merge "Fix saving target fragment when Fragment not yet created." into oc-dev
Seigo Nonaka [Tue, 4 Apr 2017 18:39:06 +0000 (18:39 +0000)]
Merge "Change justification parameter from boolean to int." into oc-dev
am:
04fc05cd66
Change-Id: Ie4fcc93178abfb850068612b02cf3c82dba71377
TreeHugger Robot [Tue, 4 Apr 2017 18:29:54 +0000 (18:29 +0000)]
Merge "Change justification parameter from boolean to int." into oc-dev
Jean-Michel Trivi [Tue, 4 Apr 2017 18:26:44 +0000 (18:26 +0000)]
Revert "AudioAttributes: remove static getVolumeControlStream method"
This reverts commit
e0b5bf50d6cf4621e483d0c85898a61a19ff6d45.
Change-Id: I2f3f10c149b205d22c41d5c9767ea10b0dee7682
Android Build Merger (Role) [Tue, 4 Apr 2017 17:57:46 +0000 (17:57 +0000)]
Merge "Merge "Load IA resolver settings from resolver package" into oc-dev am:
7f654b2776" into oc-dev-plus-aosp
Jesse Evans [Tue, 4 Apr 2017 17:57:08 +0000 (17:57 +0000)]
Merge "Load IA resolver settings from resolver package" into oc-dev
am:
7f654b2776
Change-Id: I9cfbdd0ec27cd20f2d65ef0520e691ed20082913
Sanket Padawe [Tue, 4 Apr 2017 17:56:33 +0000 (17:56 +0000)]
Merge "Merge commit '
b73a3bd336edc8fa22ba61fb24a17036cbefce76' into manual_merge_b73a3bd336ed" into oc-dev-plus-aosp
Sanket Padawe [Tue, 4 Apr 2017 17:53:19 +0000 (10:53 -0700)]
Merge commit '
b73a3bd336edc8fa22ba61fb24a17036cbefce76' into manual_merge_b73a3bd336ed
Change-Id: I5c5daf994092fba7ef6ff4a2987344f0503d9dfe
Kang Li [Tue, 4 Apr 2017 17:51:03 +0000 (17:51 +0000)]
Merge "Add a service to rank apps for ResolverActivity." into oc-dev
am:
6df90fa53b
Change-Id: I667b1f9d07305d58f921280f8b8fe9ede0aeea1e
TreeHugger Robot [Tue, 4 Apr 2017 17:48:36 +0000 (17:48 +0000)]
Merge "Load IA resolver settings from resolver package" into oc-dev
OSDN Git Service
