tree 8a91a27f8c0c081de4e3697db3a7a7191551aad9
parent 252026cf6483dd5c2e25f9c0dea7cf24ff42b8d3
parent 4b2033ca3a8055afebf8b96e86dea5f79b6aeb5e
author Chih-hung Hsieh <chh@google.com> 1473527806 +0000
committer android-build-merger <android-build-merger@google.com> 1473527806 +0000

Merge "Fix google-explicit-constructor warnings in media." am: de9d105255
am: 4b2033ca3a

Change-Id: I1aac222881725d729f6d8db9b8f22e9c096ead1b