From: jiabin <jiabin@google.com>
Date: Sat, 19 May 2018 00:08:32 +0000 (-0700)
Subject: Merge "Set enabledSurroundFormats as empty string when it is null." into pi-dev am... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b705ebf12470510d776ca456dc9b4aeb992c8ce3;p=android-x86%2Fframeworks-base.git

Merge "Set enabledSurroundFormats as empty string when it is null." into pi-dev am: 66726f3609
am: 065423e5b3

Change-Id: I03213d3838cf603eec81d008de0f1f09c9a23772
---

b705ebf12470510d776ca456dc9b4aeb992c8ce3