ee6c914 Update to upstream 1.18.0

Authored and Committed by Alan Pevec 8 years ago
    Update to upstream 1.18.0
    
    Change-Id: I40323521e734d87bbd18e26f6a4d61ebddd2be9f
    
        
file modified
+1 -0
file modified
+25 -13
file modified
+1 -1