Merge "Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into...
Merge "Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev am: c4e8471b am: 613dc4cc" into nyc-mr1-dev-plus-aosp
am: 349ca27c
* commit '349ca27c':
Change-Id: Ia9fb2f48a531dbcee40fdd2ed555a2af107a2028