Merge "Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev am: c4e8471ba4 am: 613dc4cc1d" into nyc-mr1-dev-plus-aosp
am: 349ca27ce3
* commit '349ca27ce30390f41bb9147b438fe43e0367df6c':
Change-Id: Ia9fb2f48a531dbcee40fdd2ed555a2af107a2028
This commit is contained in: