tree 0d4fefc96c8813179a9103b550fbedf2689893c8
parent 4b058e7e5d58fb1bc6ba82eba94f7664e5b85706
parent 4fdfda5cd2b1d8670bdcf6048028f28875710a69
author qinzhichao <qinzhichao@xiaomi.com> 1484264405 +0000
committer android-build-merger <android-build-merger@google.com> 1484264405 +0000

Merge "Fix issues crashing with Fatal signal when calling getFormat" am: 1808b0e3e4 am: 93b375b781
am: 4fdfda5cd2

Change-Id: I080c8c2e71488c9799e2730be97ef68db2f7d866