Commit graph

228 commits

Author SHA1 Message Date
Rici.Yu
5a7d67fd7f ASM #18773 - additional changes
Change-Id: I52a0386d069174f6f1ca5fcfd5bf60ddaf659e79

Former-commit-id: 0f686d1ddd18c55a40e9f6aa57f4bbf55387d717
2016-03-28 11:05:56 -04:00
Rici.Yu
6426c0ecee ASM #18773 - BOIVerify fails after 16.2.1 numpy upgrade
Change-Id: I879e282e97f1b014cd65b0e5109669e4a6ea8c5b

Former-commit-id: e3021f826d8954a29a642556751a6b65e75802f1
2016-03-24 09:35:48 -04:00
Shawn.Hooper
528fea0e4e Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
Former-commit-id: 44af64b6c2b7c08b29e21d0b2975cba0d15c5507
2016-02-25 15:12:04 -05:00
Ron Anderson
21fce01ece Omaha #5374 Added sendWFOMessage to SmartScript
(cherry picked from commit bc1f577171bd61624498d0df96ac1937ec1dab60 [formerly 0cc3bbdf6ca35a99532726de9f7fd9b6149dbf97])

 Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py


Former-commit-id: 1d4f3721d21481ed2e084cd72e95479e3e2e2bb5
2016-02-25 09:59:55 -06:00
Shawn.Hooper
663c44637f Merge tag 'OB_16.1.2-20' into asm_16.2.1
16.1.2-20

Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Change-Id: I9ed1c12896ffa710e7995f9682b4be1de88fa077

Former-commit-id: 9e3470f2b741592182dfae3e873503eb22df4f18
2016-02-22 11:13:16 -05:00
Sarah Pontius
4cd9308fa9 VLab Issue #15555 - HTI and Local TCV/HLS Revisions; fixes #15555
Change-Id: I5b8f8cd8dcedf3be427b81423bc9fc7bda794bc2

Former-commit-id: 5e055ffea9db10859d9217ebbf3a5f86999800b4
2016-02-12 14:47:40 -07:00
Shawn.Hooper
ca353d1ba9 Merge remote-tracking branch 'vlab/field_16.2.1' into master_16.2.1
Former-commit-id: dcf59801f1e24d2cf38b51896b17f3f3cc51d69d
2016-02-11 16:05:40 -05:00
Ana Rivera
7e9fd3ba8c VLab Issue #15494 - DR18600 GFE:Remove unnecessary references in Run_NWPS.py procedure; fixes #15494
Change-Id: I4238c3e43e185402640890c462eebad6647ec45b

Former-commit-id: 24eedfe35831a5d4c6a29d3aa4b98246abccf6af
2016-02-05 20:38:57 +00:00
Shawn.Hooper
65ed37fe67 Merge remote-tracking branch 'asm/asm_16.2.1' into master_16.2.1
Former-commit-id: f9d6debd8f835e8fd9f80fab2a70460ad06303c8
2016-01-27 17:14:01 -05:00
Shawn.Hooper
12fc325051 Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
Former-commit-id: 38a3f56c751b61b312e3f031d00f07cc9b9d420d
2016-01-27 17:13:38 -05:00
Bruce.Hundermark
3e9df01b7a ASM #18562 - ISC_Discrepancies not working for time range between current time and zulu
Change-Id: I0b25fb0600a3605c4cddab60174ca75e9d3f724c

Former-commit-id: 2d031529e12189b451582b8cd4797c8e91e09772
2016-01-27 18:35:20 +00:00
Sarah Pontius
da545043c9 VLab Issue #15111 - TCV and HLS Revisions; fixes #15111
Change-Id: I013d6f23d30fb7471923fe1ad3883f4329b77cbf

Former-commit-id: fc7322a5615887e12ddd5364ed593b7d3595b967
2016-01-26 11:40:15 -07:00
Shawn.Hooper
2861d7abd7 Merge tag 'OB_16.1.2-14' into master_16.2.1
16.1.2-14

Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Change-Id: If4483610b92d4c2ef975c3ac75403e12a70d612c

Former-commit-id: 66d3cd35731e59996c34f003e42cbb2a41010717
2016-01-25 14:32:31 -05:00
Ron Anderson
3d867790f3 Omaha #4751 Fix type of mask returned from getComposite()
Change-Id: I0c136042a0ea43bb2cf7b9462eb9fea257b19ab9

Former-commit-id: 23bed260bc1e1302070f49dadc3a978e218ee513
2016-01-20 18:22:39 -06:00
Shawn.Hooper
3f05c3da44 Merge remote-tracking branch 'vlab/field_16.2.1' into master_16.2.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: I279d046dc8a054563c9ddabd92350f8d97222355

Former-commit-id: f9ff90f121eff9ae632b8bcc47c3500d9f647d00
2016-01-20 16:49:53 -05:00
Ana Rivera
35b00be61e Merge branch 'master_16.2.1' into field_16.2.1
Change-Id: I197477fc4ceeb0efbd47335a98df7a2bedb703e0

Former-commit-id: 521d1a43251c5c8a697eccd7d09965dee58fd50b
2016-01-15 16:09:14 +00:00
Ana Rivera
ce676e7137 VLab Issue #14839 - DR18499 HTI Improvements:TCFloodingRainThreat; fixes #14839
Modify script to avoid duplication in modelList. (Ref: DCS16913)

Change-Id: I2f0d5eaafee7b391b3e6af58e01f4ec51f4d13cd

Former-commit-id: 6ee88ef090e525fd1552d0c3a48f09c6a6722623
2016-01-13 16:16:44 +00:00
Shawn.Hooper
bd27f40c6d Merge tag 'OB_16.1.2-9' into master_16.2.1
16.1.2-9

Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewStationDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewZoneDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/DeleteStationDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCFloodingRainThreat.py
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaIdXML.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/MonAreaConfigXML.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/StationIdXML.java
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Change-Id: Ife2115435399146e4873a14f80e73acc15ad1b5c

Former-commit-id: 3d8811acf334fb06854bbaa71d35cff2657b3b7b
2016-01-12 15:10:02 -05:00
Ana Rivera
c2f8228c2d Merge branch 'master_16.2.1'(OB_16.2.1-4) into field_16.2.1
Change-Id: I617467c415770772d536ebf63fbee37d05dda274

Former-commit-id: 0404e732800c94130a76226e3b0c8947f09b6bac
2016-01-05 14:40:05 +00:00
Shawn.Hooper
dc86635bb9 Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java

Former-commit-id: 071dbbc21ea440c1c4cb5bbd739ddcba861cdefd
2015-12-31 09:31:25 -05:00
Ana Rivera
8736560556 VLab Issue #14020 - DR18419 Baseline GridManipulation.py; fixes #14020
Required by CopyNHCProposed.py. Code provided by Matt Belk.

Change-Id: Ibca897836b703c6af24c9e48ee8948edc2a9e77a

Former-commit-id: d47611ec55c292c0276145b2037e1e6153d65d77
2015-12-17 14:40:52 +00:00
Ana Rivera
cfc3107049 VLab Issue #9806 - DCS16913(set_3) HTI Improvements: CopyNHCProposed.py; fixes #9806
Change-Id: I1d5ac66566bb92c7e5aef9d264baab9325fdc264

Former-commit-id: 6834535722d3017b082239e3c72c24a4ead7a565
2015-12-12 18:06:19 +00:00
Ron Anderson
643e97bcb9 Omaha #4751 Fix typos introduced earlier under this DR
Change-Id: I544f9cf17b0a44d4a1d89169ed80dc6bd7d085e3

Former-commit-id: 9795b4927500fc9f862faf281b635ad88e0914ce
2015-12-10 10:27:26 -06:00
Ana Rivera
99228057e8 VLab Issue #13637 - DCS16913 TCFloodingRainThreat.py; fixes #13637
(DCS16913 set_2)

Change-Id: Id012766e9c394dd3f85582c488d2ce764799268e

Former-commit-id: 97e6a3d9fba1f013486dc1214ab1414468dfffeb
2015-12-07 18:53:17 +00:00
Ana Rivera
9deb6f14ab VLab Issue #8168 - DR17495 Run_NWPS script update (set_2); fixes #8168
Addresses comment in merged change set 4335:
 https://vlab.ncep.noaa.gov/code-review/#/c/4335/5

Change-Id: Ibdbdfbe13a1853d316bc6464954ef969f691aee8

Former-commit-id: fd279baac3ee41fd269db5c345c5e4f970937b22
2015-12-07 17:07:44 +00:00
Ana Rivera
bc0a126063 VLab Issue #8168 - DR17495 Configure LDMSERVER values for Run NWPS script in an environment file; fixes #8168
* smartinit/nwpsCG1.py & nwpsTrkngCG0.py - eliminates multiple banners
* gfesuite/nwps/bin/runManualNWPS_OutsideAWIPS.sh - install on px2f
* gfesuite/nwps/etc/sitevars.ccc - install on px2f
* procedures/Run_NWPS.py
* gfesuite/nwps/* - chmod for directories and subdirectories
*    to 775. chown to awips:fxalpha

Change-Id: I5938b66c2ae7d92642bf9e4022737569585e6bea

Former-commit-id: 4c08765fc72325e818dacc6394ee53719edac6db
2015-12-04 14:35:14 +00:00
Shawn.Hooper
e93839673c Merge branch 'asm_16.2.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.2.1
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py

Former-commit-id: 0d5c4caf82d74459f9412800955d6cb9da18f3fb
2015-11-25 14:31:20 -05:00
Sarah Pontius
917effa917 VLab Issue #12917 - TCV and HLS Improvements; fixes #12917
Change-Id: I9f9c652d32176e0e12317896001eb8613ef21c57

Former-commit-id: 2f562bdb68479d53997788b9227b7f25b972231f
2015-11-19 15:36:50 -07:00
Shawn.Hooper
4982393e5d Merge branch 'asdt_16.2.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.2.1
Former-commit-id: 70c5b3a39104af92685e80e7e76177deb05c94e5
2015-11-16 16:40:30 -05:00
Ana Rivera
79a8dee7f1 VLab Issue #9806 - DCS16913 HTI Improvements: CopyNHCProposed.py; fixes #9806
.../procedures/TCStormSurgeThreat.py (delivered with vlab 9807,DCS17369)
 .../procedures/CopyNHCProposed.py
 .../procedures/TCFloodingRainThreat.py (pending)

Change-Id: Ifad0b55a0ee0d0b292fe184fc774c185d3d0490d

Former-commit-id: 4276534d8f56da0cefb17aa528ddcfbd1b0e6ca9
2015-11-10 16:27:11 +00:00
Ana Rivera
794f0ce6a9 VLab Issue #9807 - DCS17369 HTI:TCStormSurgeThreat updates (set_2); fixes #9807
Change-Id: I32c5a91c23b79539f4c8a6d3cf6e73e3aa7f3ce8

Former-commit-id: 927e1fc6afa113a6c6a6f81ec7f942d198e4e085
2015-11-10 15:01:08 +00:00
Ana Rivera
3a4c86515b VLab Issue #9807 - DCS 17369 HTI:change StormSurgeWW_EditArea to shapefile; fixes #9807
Add map bundles: stormsurgeww.xml and nhadomain.xml
Update Maps.py, serverConfig.py and TCStormSurgeThreat.py
Remove StormSurgeWW_EditArea.xml

Change-Id: If080dc3b54bbce8e6cc33b5d9aa68d1d7473cee5

Former-commit-id: 622b9c620e073d0acd7530065f2c413cb2c0ca1d
2015-11-09 19:50:53 +00:00
Bruce.Hundermark
c2715a3dd8 ASM #17294 Modification to the Limit Values Smart Tool
Change-Id: I0eb18ac117e4a1f3eb5a1d8640058b5c9be5667c

Former-commit-id: df1ce1fcc7eac539d5b143b7efb5b19a45f4dd75
2015-11-04 14:59:57 +00:00
Wen Kwock
9304a92038 VLab Issue #10138 Fix the 4 digit year issue; fixes #10138
Change-Id: Id80efa6949367b2bdff3235c4b986ff248ee8143

Former-commit-id: 128667a3220d79eaad66299286fcca8847aa13c7
2015-11-03 16:20:25 +00:00
Yun.Teng
b06426b911 ASM #17701 - Fixed bug in formatters not reporting hazards from ISC database
Change-Id: I8c49848b938528f26221a3cd0e2aff91386bee0b

Former-commit-id: 5092546ea882df4687cf526fa40886f4df54383b
2015-10-29 15:00:46 +00:00
Steve Harris
7b8cbf9807 Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java


Former-commit-id: bd9bedb5a583e43a8fd4b18f406bf505a0bfd48a
2015-10-27 10:53:33 -05:00
Penghai.Wang
d7e3507a76 Merge branch 'omaha_16.2.1' into asdt_16.2.1
Former-commit-id: 273eca0d9d60a0a0f18ac0e3977e79391be0c432
2015-10-23 20:00:22 +00:00
Steve Harris
56131ac305 Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/GageData.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: fa9ad9b8a3900bd5f94017f27bec9a5673ecb881
2015-10-21 09:22:00 -05:00
Shawn.Hooper
eff6191e21 Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: 97b375aa7cc85db9fd1e1c9eb82da3f3d3819263
2015-10-20 14:38:16 -04:00
Penghai.Wang
e3f4d27d0e Merge branch 'omaha_16.2.1' into asdt_16.2.1
Former-commit-id: 6d1b5f63867542721ed6241011250fe39a4c4b94
2015-10-20 17:42:04 +00:00
Rici.Yu
f1f0f52fd1 ASM #18183 - Check in David Gillingham's changes
Change-Id: If953bd531f92323130a680f901dba0d899fc9239

Former-commit-id: 5fcbb71568d72653d007f2f5c32059edfce4c895
2015-10-19 14:55:00 -04:00
Shawn.Hooper
90badd7a3e Merge tag 'OB_15.1.2-9' into master_16.1.1
15.1.2-9

Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/RiverStatData.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/ContactsDataManager.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/DescriptionDataManager.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/LocationAreaManager.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: e9e9660925d0afc016f88ec73182f9eae6ab0c18
2015-10-15 17:10:19 -04:00
Ron Anderson
82e09ad9b4 Omaha #4961 Create/update procedures for using GMTED2010 terrain in GFE.
Change-Id: I6b51386be983546d0637d4f85ebdad87abcce3a4

Former-commit-id: 2ff9b807b8586bbb56880fe5f3f26505bbd5d87d
2015-10-14 17:30:50 -05:00
Ron Anderson
d126af0f85 Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/FormatterlauncherAction.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowProductScriptsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowPublishDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowSendIscGridsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductAreaComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenAction.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.plugin.loctables/src/com/raytheon/uf/edex/plugin/loctables/ingest/LocationTablesIngest.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Change-Id: Ie790e3a9a0c3829655a5a798a2c8b6740d02be6c

Former-commit-id: 691ca66a6f15c3cfae1bd1c8990644951d68a46f
2015-10-14 16:31:41 -05:00
Penghai.Wang
caad2ed64f Merge branch 'omaha_16.2.1' into asdt_16.2.1
Former-commit-id: 83b8514e48dcc33581706d25cfffa17f2ae671cd
2015-10-08 19:54:09 +00:00
Juliya Dynina
75371216ad Merge "ASM #17978 fixed the hydroview display for time step" into asm_16.1.1
Former-commit-id: 82ea99a28bb9183b347c816889679bf8a8e0c27e
2015-10-08 14:41:27 -05:00
Shawn.Hooper
4a5cc197fc ASM #18120 - Changes to add tsunami advisory to GFE
Change-Id: I93205516d5111c4f4482f857adfc491e218e65c7

Former-commit-id: 64700a4ddf86de279317170e7fe90c4ccb613f40
2015-10-07 13:32:18 -04:00
Shawn.Hooper
8afca919d6 Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: 4b8114b253583c5d0c0b7d0fe09b844a2bca0881
2015-10-05 16:47:46 -04:00
David Gillingham
00cc3b6b39 Omaha #4888: Do not allow GFE to publish grids, transmit/generate text products or use ISC mode when DRT mode is enabled for operational mode.
(cherry picked from commit a2c9879dbc [formerly 5461d2ce24a95372902d58c8c8d43963d93ccd36])

Change-Id: Iefe86516fa941d6043b12fa6c7cebdd0803feff6

Former-commit-id: d5887279883f4fc742deea6a31403f74fb6f07ae
2015-10-01 13:56:59 -05:00
Rici.Yu
c623963b36 ASM #18141 - check in changes Ron identified
Change-Id: Idbef45bd5fa2f19a247a7abfaee22482db3e7c26

Former-commit-id: c3cba26391a4cd9c039533f756a9c3bea87ecc19
2015-09-30 15:33:17 -04:00