OSDN Git Service
Bryce Lee [Thu, 27 Apr 2017 22:46:52 +0000 (22:46 +0000)]
Merge "Don't call adjustFocusedActivityStackLocked on finished activity." into oc-dev
am:
d08c064976
Change-Id: I16b6bd1905880f96b6a2d47915556b9775a3689a
Sudheer Shanka [Thu, 27 Apr 2017 22:25:14 +0000 (22:25 +0000)]
Merge "Update VIMS internal state when a packge is modified." into oc-dev
am:
8dd177c4e8
Change-Id: Ibf0daf62f79608cf6616226762d959f0aac20d3b
Tima Vaisburd [Thu, 27 Apr 2017 22:17:54 +0000 (22:17 +0000)]
Merge "Hide getTextClassifier and setTextClassifier for WebView" into oc-dev
am:
9c14b91aa9
Change-Id: Ifaa89f3fd18fff60e8d702b2352e39b9e3dba744
Jakub Pawlowski [Thu, 27 Apr 2017 21:24:35 +0000 (21:24 +0000)]
Merge "Fix NPE when accessing mCallback in BluetoothGatt" am:
1be8fb23eb am:
28f182aa87
am:
3657c398e1
Change-Id: I9425efce8de6376c0e3c74401d74da39e8037b98
Jeff Davidson [Thu, 27 Apr 2017 21:22:23 +0000 (21:22 +0000)]
Merge "Rename getDataEnabled() to isDataEnabled()." am:
4898b704de am:
0b79745dd1
am:
f026342263 -s ours
Change-Id: I991af9483fa932479f5a1af5809596ce067a69a8
Chen Xu [Thu, 27 Apr 2017 21:17:09 +0000 (21:17 +0000)]
Merge "Add getVisualVoicemailPackageName()" am:
998eb212bd am:
2eae7bfc03
am:
36b80785a6 -s ours
Change-Id: I4915bc05c136f87ed79d8f77f101c0b439a01488
Pankaj Kanwar [Thu, 27 Apr 2017 21:14:07 +0000 (21:14 +0000)]
Merge "resolve merge conflicts of
8814befacdf5 to oc-dev-plus-aosp" into oc-dev-plus-aosp
Bryce Lee [Thu, 27 Apr 2017 20:41:32 +0000 (20:41 +0000)]
Merge "Don't call adjustFocusedActivityStackLocked on finished activity." into oc-dev
Amith Yamasani [Thu, 27 Apr 2017 20:35:44 +0000 (20:35 +0000)]
Merge "Improve docs for AssistStructure#isHomeActivity" into oc-dev
am:
3a4987bbe7
Change-Id: If3007f9a939cb17be63fe148d68178c9fabfea48
Adrian Roos [Thu, 27 Apr 2017 20:33:47 +0000 (20:33 +0000)]
Merge "SysUI A11y: Fix keyguard time utterance" into oc-dev
am:
898b0cb39a
Change-Id: Ifdc2b56ce9b59ea9c3f185fb6fac8850842bbb67
Sudheer Shanka [Thu, 27 Apr 2017 20:31:04 +0000 (20:31 +0000)]
Merge "Update VIMS internal state when a packge is modified." into oc-dev
Makoto Onuki [Thu, 27 Apr 2017 20:25:57 +0000 (20:25 +0000)]
Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev
am:
301663a61b
Change-Id: I93d38d5255975a211723b41eacaec5ab882a7621
Tima Vaisburd [Thu, 27 Apr 2017 20:22:09 +0000 (20:22 +0000)]
Merge "Hide getTextClassifier and setTextClassifier for WebView" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 20:21:44 +0000 (20:21 +0000)]
Merge "Improve docs for AssistStructure#isHomeActivity" into oc-dev
Pavel Grafov [Thu, 27 Apr 2017 20:12:22 +0000 (20:12 +0000)]
Merge "Use InetAddress instead of String in network events." into oc-dev
am:
54e534d6e7
Change-Id: I27f51d0183f0e28e2d17f41c69f35aee6a6785a7
TreeHugger Robot [Thu, 27 Apr 2017 20:10:49 +0000 (20:10 +0000)]
Merge "SysUI A11y: Fix keyguard time utterance" into oc-dev
Makoto Onuki [Thu, 27 Apr 2017 20:03:16 +0000 (20:03 +0000)]
Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev
Jakub Pawlowski [Thu, 27 Apr 2017 19:56:09 +0000 (19:56 +0000)]
Merge "Fix NPE when accessing mCallback in BluetoothGatt" am:
1be8fb23eb
am:
28f182aa87
Change-Id: I85f4847b7c530bded24dcb27faa851ed9b5ba653
TreeHugger Robot [Thu, 27 Apr 2017 19:53:48 +0000 (19:53 +0000)]
Merge "Use InetAddress instead of String in network events." into oc-dev
Jakub Pawlowski [Thu, 27 Apr 2017 19:46:06 +0000 (19:46 +0000)]
Merge "Fix NPE when accessing mCallback in BluetoothGatt"
am:
1be8fb23eb
Change-Id: I764b7a169e5acabef07fafc43367040d8d493d7b
Chad Brubaker [Thu, 27 Apr 2017 19:41:06 +0000 (19:41 +0000)]
Merge "Allow apps to provide the Instant App installer extra information" into oc-dev
am:
a9d0e6b205
Change-Id: I6edd3a615c1c276b6d7842af471dc928281f1f6f
Treehugger Robot [Thu, 27 Apr 2017 19:37:53 +0000 (19:37 +0000)]
Merge "Fix NPE when accessing mCallback in BluetoothGatt"
Jakub Pawlowski [Thu, 27 Apr 2017 14:04:15 +0000 (07:04 -0700)]
Fix NPE when accessing mCallback in BluetoothGatt
This issue was introduced in commit
4eab49652e48159fd37f827d30b822f2f187551e.
Bug:
37710354
Test: none
Change-Id: I2d985ce97c44d4e096713e156e57437f44ea3ddb
pkanwar [Thu, 27 Apr 2017 19:31:39 +0000 (12:31 -0700)]
resolve merge conflicts of
8814befacdf5 to oc-dev-plus-aosp
Test: manual
BUG:
35606429
Change-Id: I0e9c5edaaa3e0ddf7719ebbffd650b8bdd88faa1
Chad Brubaker [Thu, 27 Apr 2017 19:30:50 +0000 (19:30 +0000)]
Merge "Allow apps to provide the Instant App installer extra information" into oc-dev
Michal Karpinski [Thu, 27 Apr 2017 19:16:09 +0000 (19:16 +0000)]
Merge "Reenable presubmit runs for BackupSettingsTest now that it's fixed" into oc-dev
am:
38439169bd
Change-Id: I3220ae4b0c2da8438ffd034649dd8fc950b20b36
TreeHugger Robot [Thu, 27 Apr 2017 19:03:18 +0000 (19:03 +0000)]
Merge "Reenable presubmit runs for BackupSettingsTest now that it's fixed" into oc-dev
Andrii Kulian [Thu, 27 Apr 2017 18:32:00 +0000 (18:32 +0000)]
Merge "Report correct display id in stack info" into oc-dev
am:
0dca566677
Change-Id: Ieebfe01fb98d066be46aea23ca0206d17dd92b67
Jeff Davidson [Thu, 27 Apr 2017 18:27:00 +0000 (18:27 +0000)]
Merge "Rename getDataEnabled() to isDataEnabled()." am:
4898b704de
am:
0b79745dd1
Change-Id: Id9d1f415a386238e6357f5952f78e395ee034bd2
Android Build Merger (Role) [Thu, 27 Apr 2017 18:23:19 +0000 (18:23 +0000)]
Merge "Merge "Limit btsnoop file size (3/8)" am:
37cad12cb1 am:
e429211064 am:
c1da2a0341 -s ours" into oc-dev-plus-aosp
Ajay Panicker [Thu, 27 Apr 2017 18:20:40 +0000 (18:20 +0000)]
Merge "Limit btsnoop file size (3/8)" am:
37cad12cb1 am:
e429211064
am:
c1da2a0341 -s ours
Change-Id: I91b79208a1afea91ab83bfe9b687710945f66742
Andrii Kulian [Thu, 27 Apr 2017 18:19:32 +0000 (18:19 +0000)]
Merge "Hide onMovedToDisplay callback" into oc-dev
am:
bfe5aa23e8
Change-Id: I457340e86ffcfb9256960c554d8041a208d7cdad
Andrii Kulian [Thu, 27 Apr 2017 18:18:29 +0000 (18:18 +0000)]
Merge "Report correct display id in stack info" into oc-dev
Jeff Davidson [Thu, 27 Apr 2017 18:17:28 +0000 (18:17 +0000)]
Merge "Rename getDataEnabled() to isDataEnabled()."
am:
4898b704de
Change-Id: Ic11d6568aac8cdad151c61fa32d4535ccea9f53b
Andrii Kulian [Thu, 27 Apr 2017 18:09:13 +0000 (18:09 +0000)]
Merge "Hide onMovedToDisplay callback" into oc-dev
Chen Xu [Thu, 27 Apr 2017 18:07:30 +0000 (18:07 +0000)]
Merge "Add getVisualVoicemailPackageName()" am:
998eb212bd
am:
2eae7bfc03
Change-Id: I86cec4ba1f4cbc86fa84dc9d036542bebcc93100
Jeff Davidson [Thu, 27 Apr 2017 18:03:31 +0000 (18:03 +0000)]
Merge "Rename getDataEnabled() to isDataEnabled()."
Pankaj Kanwar [Thu, 27 Apr 2017 17:58:16 +0000 (17:58 +0000)]
Merge "RIL changes to allow the modem to query the framework for the key." am:
0c83ef2c72
am:
1dec74b78f
Change-Id: I6b15e49763d8e0cfa23238834a8056288de77176
Chen Xu [Thu, 27 Apr 2017 17:57:36 +0000 (17:57 +0000)]
Merge "Add getVisualVoicemailPackageName()"
am:
998eb212bd
Change-Id: I482cd62e9f2330624e688b8d65aa9353500b1d79
Pavel Grafov [Thu, 27 Apr 2017 13:22:26 +0000 (14:22 +0100)]
Use InetAddress instead of String in network events.
This is a conservative change that converts strings to
InetAddress on the fly just before givint it to the client.
Also renamed getIpAddressesCount to getTotalResolvedAddressCount
to make it 1) harder to misuse it as getInetAddresses().length
2) more descriptive.
Bug:
37625453
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/NetworkEventTest.java
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Change-Id: I2a31dddd6874f1a629895e4dff105cf41984a775
Pankaj Kanwar [Thu, 27 Apr 2017 17:49:09 +0000 (17:49 +0000)]
Merge "RIL changes to allow the modem to query the framework for the key."
am:
0c83ef2c72
Change-Id: I8a326ac926e880d8095330638e54d56ad8c98485
Ajay Panicker [Thu, 27 Apr 2017 17:48:58 +0000 (17:48 +0000)]
Merge "Limit btsnoop file size (3/8)" am:
37cad12cb1
am:
e429211064
Change-Id: I9ce4924aba66c45425789dd16e477dfa99e6b74a
Chen Xu [Thu, 27 Apr 2017 17:46:02 +0000 (17:46 +0000)]
Merge "Add getVisualVoicemailPackageName()"
Android Build Merger (Role) [Thu, 27 Apr 2017 17:43:20 +0000 (17:43 +0000)]
Merge "Merge "Revise method comment on setFontVariationSettings" into oc-dev am:
e6746726bc" into oc-dev-plus-aosp
Seigo Nonaka [Thu, 27 Apr 2017 17:42:40 +0000 (17:42 +0000)]
Merge "Revise method comment on setFontVariationSettings" into oc-dev
am:
e6746726bc
Change-Id: Id0cd07f81ca333c4d71aba902d6108c267938328
Android Build Merger (Role) [Thu, 27 Apr 2017 17:42:04 +0000 (17:42 +0000)]
Merge "Merge "documentation fixes" into nyc-mr1-dev am:
14826e5489 am:
b1e3d9ab26 am:
4ea763ad8a am:
6986e8a1ba" into oc-dev-plus-aosp
Pankaj Kanwar [Thu, 27 Apr 2017 17:41:56 +0000 (17:41 +0000)]
Merge "RIL changes to allow the modem to query the framework for the key."
David Farrow [Thu, 27 Apr 2017 17:41:21 +0000 (17:41 +0000)]
Merge "documentation fixes" into nyc-mr1-dev am:
14826e5489 am:
b1e3d9ab26 am:
4ea763ad8a
am:
6986e8a1ba
Change-Id: I74141f17f116f4be59f8925868894c805ee1fec2
Android Build Merger (Role) [Thu, 27 Apr 2017 17:40:52 +0000 (17:40 +0000)]
Merge "Merge "Reduce scrypt time in synthetic password flow" into oc-dev am:
71e0fcbf2f" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 27 Apr 2017 17:40:23 +0000 (17:40 +0000)]
Merge "Merge "documentation fixes" into nyc-mr1-dev am:
14826e5489 am:
b1e3d9ab26 am:
4ea763ad8a am:
393f0c185a" into oc-dev-plus-aosp
Rubin Xu [Thu, 27 Apr 2017 17:40:02 +0000 (17:40 +0000)]
Merge "Reduce scrypt time in synthetic password flow" into oc-dev
am:
71e0fcbf2f
Change-Id: If8b4d7845160bc0887f5b3b535135849d00b6d01
Ajay Panicker [Thu, 27 Apr 2017 17:39:14 +0000 (17:39 +0000)]
Merge "Limit btsnoop file size (3/8)"
am:
37cad12cb1
Change-Id: I75129661ddb46e9975c7752ffb40e64d4430660b
David Farrow [Thu, 27 Apr 2017 17:38:28 +0000 (17:38 +0000)]
Merge "documentation fixes" into nyc-mr1-dev am:
14826e5489 am:
b1e3d9ab26 am:
4ea763ad8a
am:
393f0c185a
Change-Id: Ic297a3643a0f01d6d8315b973c2e0863d193446a
Doris Liu [Thu, 27 Apr 2017 17:37:56 +0000 (17:37 +0000)]
Merge "Refine JavaDocs for AnimatorSet#getCurrentPlayTime()" into oc-dev
am:
f4063d4201
Change-Id: Ia793fb18c70744db2c384ea6691635f1abc4179d
TreeHugger Robot [Thu, 27 Apr 2017 17:34:43 +0000 (17:34 +0000)]
Merge "Revise method comment on setFontVariationSettings" into oc-dev
Ajay Panicker [Thu, 27 Apr 2017 17:29:35 +0000 (17:29 +0000)]
Merge "Limit btsnoop file size (3/8)"
David Farrow [Thu, 27 Apr 2017 17:28:28 +0000 (17:28 +0000)]
Merge "documentation fixes" into nyc-mr1-dev am:
14826e5489 am:
b1e3d9ab26
am:
4ea763ad8a
Change-Id: I1b3005ef17b9d54e1f9b9c75138d214e80fc414c
David Farrow [Thu, 27 Apr 2017 17:28:26 +0000 (17:28 +0000)]
Merge "documentation fixes" into nyc-mr1-dev am:
14826e5489 am:
b1e3d9ab26
am:
4ea763ad8a
Change-Id: Iecae5becb23a80e0b8322a655ce75125a33cbdc8
Rubin Xu [Thu, 27 Apr 2017 17:24:56 +0000 (17:24 +0000)]
Merge "Reduce scrypt time in synthetic password flow" into oc-dev
Doris Liu [Thu, 27 Apr 2017 17:20:19 +0000 (17:20 +0000)]
Merge "Refine JavaDocs for AnimatorSet#getCurrentPlayTime()" into oc-dev
David Farrow [Thu, 27 Apr 2017 17:19:21 +0000 (17:19 +0000)]
Merge "documentation fixes" into nyc-mr1-dev am:
14826e5489
am:
b1e3d9ab26
Change-Id: I4f2682c11384a9f656054b95cfba56132085634a
Mukesh Agrawal [Thu, 27 Apr 2017 17:12:17 +0000 (17:12 +0000)]
Merge "Log: increase visibility of Log.TerribleFailure" am:
5e253647ad am:
f6328d6943
am:
864dffcd81
Change-Id: I04838769ed83bd6b8283fbcb658ff89a4f92dee6
David Farrow [Thu, 27 Apr 2017 17:09:26 +0000 (17:09 +0000)]
Merge "documentation fixes" into nyc-mr1-dev
am:
14826e5489
Change-Id: I18df5f88d8f72ec74e62b39a056459e4e715b9db
Mady Mellor [Thu, 27 Apr 2017 17:07:58 +0000 (17:07 +0000)]
Merge "Improve swipe to show notification menu gesture" into oc-dev
am:
aa94a61c56
Change-Id: I8221d18deed280c08d93739bcaf24bca0454b302
Brad Ebinger [Thu, 27 Apr 2017 17:03:20 +0000 (17:03 +0000)]
Merge "Better handle MSIM DDS changed event" am:
4418eb4ddf am:
8a3f025d71
am:
71f70d6685
Change-Id: I55cac364221c728ad1c77be783c358e8d98ec2b4
Mady Mellor [Thu, 27 Apr 2017 17:01:24 +0000 (17:01 +0000)]
Merge "Improve swipe to show notification menu gesture" into oc-dev
David Farrow [Thu, 27 Apr 2017 17:01:09 +0000 (17:01 +0000)]
Merge "documentation fixes" into nyc-mr1-dev
Mukesh Agrawal [Thu, 27 Apr 2017 16:56:56 +0000 (16:56 +0000)]
Merge "Log: increase visibility of Log.TerribleFailure" am:
5e253647ad
am:
f6328d6943
Change-Id: I171542c4fd7ec40a588e5ae9e6d5cf601a77aeed
Brad Ebinger [Thu, 27 Apr 2017 16:54:26 +0000 (16:54 +0000)]
Merge "Better handle MSIM DDS changed event" am:
4418eb4ddf
am:
8a3f025d71
Change-Id: Ib5c64fdc6bdb456c811e374c910bcc595e554b1b
Wale Ogunwale [Thu, 27 Apr 2017 16:52:33 +0000 (16:52 +0000)]
Merge "Use ActivityRecord.realActivity when comparing waiting visible" into oc-dev
am:
039dcadc88
Change-Id: Id1b9f4a540a39046b365fbbf10431b86f6af63f1
Mukesh Agrawal [Thu, 27 Apr 2017 16:49:14 +0000 (16:49 +0000)]
Merge "Log: increase visibility of Log.TerribleFailure"
am:
5e253647ad
Change-Id: Ibe67ef79c9ac5de3cbfdb5f0252b058e39940c83
Brad Ebinger [Thu, 27 Apr 2017 16:46:54 +0000 (16:46 +0000)]
Merge "Better handle MSIM DDS changed event"
am:
4418eb4ddf
Change-Id: Ibadbaec61808e571ebbd1c0c2ac90cf3c5141a57
TreeHugger Robot [Thu, 27 Apr 2017 16:42:59 +0000 (16:42 +0000)]
Merge "Use ActivityRecord.realActivity when comparing waiting visible" into oc-dev
Mukesh Agrawal [Thu, 27 Apr 2017 16:40:48 +0000 (16:40 +0000)]
Merge "Log: increase visibility of Log.TerribleFailure"
Brad Ebinger [Thu, 27 Apr 2017 16:38:46 +0000 (16:38 +0000)]
Merge "Better handle MSIM DDS changed event"
Pavel Grafov [Thu, 27 Apr 2017 16:33:49 +0000 (16:33 +0000)]
Merge "Support profile global restrictions in disclosure messages." into oc-dev
am:
b258552a1c
Change-Id: Ie8d9e4d8f43274aa1bba1df66a9f0fda34d0e78b
TreeHugger Robot [Thu, 27 Apr 2017 16:23:00 +0000 (16:23 +0000)]
Merge "Support profile global restrictions in disclosure messages." into oc-dev
pkanwar [Sun, 19 Mar 2017 19:14:34 +0000 (12:14 -0700)]
RIL changes to allow the modem to query the framework for the key.
In order to support IMSI encryption, the modem needs to request the
framework for the public key of the Carrier. The framework will pass
2 fields back, the public key and a string (which is a key value pair
to be defined by the carrier).
BUG:
35606429
Test: manual
Change-Id: I609e4505508aa6bb5b442c09eb4c346106492361
Merged-In: I609e4505508aa6bb5b442c09eb4c346106492361
Narayan Kamath [Thu, 27 Apr 2017 15:45:22 +0000 (15:45 +0000)]
Merge "AndroidRuntime: pipe down dalvik.vm.stack-trace-dir" am:
0b711e2c86 am:
aab168b7cc
am:
0ddced5c44
Change-Id: I223e6167bcb5228a5175ebf7308b40a8f974e3d8
Narayan Kamath [Thu, 27 Apr 2017 15:40:19 +0000 (15:40 +0000)]
Merge "AndroidRuntime: pipe down dalvik.vm.stack-trace-dir" am:
0b711e2c86
am:
aab168b7cc
Change-Id: Iceab938d11cc334c8ffaa4321623f72b9f7cfaa8
Narayan Kamath [Thu, 27 Apr 2017 15:35:46 +0000 (15:35 +0000)]
Merge "AndroidRuntime: pipe down dalvik.vm.stack-trace-dir"
am:
0b711e2c86
Change-Id: I35050e29b7de414aa60a920d20c677028102d8ca
Narayan Kamath [Thu, 27 Apr 2017 15:26:50 +0000 (15:26 +0000)]
Merge "AndroidRuntime: pipe down dalvik.vm.stack-trace-dir"
Julia Reynolds [Thu, 27 Apr 2017 15:23:52 +0000 (15:23 +0000)]
Merge "New constant for new settings screen." into oc-dev
am:
04225787d8
Change-Id: Ie4d14f5f2954c40dcdedac8dd028e31d380eb881
Stefan Ramsauer [Thu, 27 Apr 2017 15:17:16 +0000 (15:17 +0000)]
Merge "Fix parameter name mismatch in getResourceIdentifier." into oc-dev
am:
ba9ab17434
Change-Id: I9d8025f6eec133ba914a43acf0fce7ddcbf6e6af
Julia Reynolds [Thu, 27 Apr 2017 15:11:32 +0000 (15:11 +0000)]
Merge "New constant for new settings screen." into oc-dev
Stefan Ramsauer [Thu, 27 Apr 2017 15:09:21 +0000 (15:09 +0000)]
Merge "Fix parameter name mismatch in getResourceIdentifier." into oc-dev
Julia Reynolds [Sun, 23 Apr 2017 16:27:07 +0000 (12:27 -0400)]
New constant for new settings screen.
Bug:
36561295
Test: make
Change-Id: I0e2ec6d7b372a9594f8b583540804dde1b79de1a
Jason Monk [Thu, 27 Apr 2017 14:51:09 +0000 (14:51 +0000)]
Merge "Revert "Status bar updates" DO NOT MERGE" into oc-dev
am:
24370bfd30
Change-Id: Ic3e25e78d3916f8939cca1ca7b449787e788fde8
Jason Monk [Thu, 27 Apr 2017 14:43:46 +0000 (14:43 +0000)]
Merge "Revert "Status bar updates" DO NOT MERGE" into oc-dev
Jason Monk [Wed, 26 Apr 2017 18:35:24 +0000 (14:35 -0400)]
Revert "Status bar updates" DO NOT MERGE
Test: runtest systemui
Fixes:
37626598
This reverts commit
d1ba5fbb54a02fad0c68f71183078527bfa9bd49.
Change-Id: I12c70b67fafd46ec98b1c1ee28b911e19afbf6e5
George Mount [Thu, 27 Apr 2017 14:18:10 +0000 (14:18 +0000)]
Merge "Address API council feedback." into oc-dev
am:
4a71842dbd
Change-Id: Ia9511f1031463b6e65437e27e6012b8e83e8961d
George Mount [Thu, 27 Apr 2017 14:06:10 +0000 (14:06 +0000)]
Merge "Address API council feedback." into oc-dev
Abodunrinwa Toki [Thu, 27 Apr 2017 13:58:36 +0000 (13:58 +0000)]
Merge "SmartSelection: Use downloaded model file." into oc-dev
am:
a97608caa8
Change-Id: If5dbd82ad5150a1d4f3cfe35dd7325468f36a94c
Jason Monk [Thu, 27 Apr 2017 13:56:42 +0000 (13:56 +0000)]
Merge "Guard against incorrect context use." into oc-dev
am:
2cddbcaa0f
Change-Id: Ia2905116802bf9d1ed88abb75aefded34d130853
TreeHugger Robot [Thu, 27 Apr 2017 13:50:52 +0000 (13:50 +0000)]
Merge "SmartSelection: Use downloaded model file." into oc-dev
Jason Monk [Thu, 27 Apr 2017 13:46:48 +0000 (13:46 +0000)]
Merge "Guard against incorrect context use." into oc-dev
Narayan Kamath [Thu, 27 Apr 2017 13:43:50 +0000 (13:43 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7." into oc-dev
am:
2e0e7f3c94
Change-Id: I14acd4352f04f16294bfc1b97c2ad9a0b9a533d4
Denis Kuznetsov [Thu, 27 Apr 2017 13:35:55 +0000 (13:35 +0000)]
Merge "Create a metrics events for ag/
2085657 (DO disclosure screens)" into oc-dev
am:
28f9ada2ac
Change-Id: Id024cab7c0edc1ebf8626f671ac281f68d71e86f
Narayan Kamath [Thu, 27 Apr 2017 13:30:30 +0000 (13:30 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 13:26:21 +0000 (13:26 +0000)]
Merge "Create a metrics events for ag/
2085657 (DO disclosure screens)" into oc-dev
OSDN Git Service
