tree 1e410847d32cd9ae7d286d68a8455ea06d482124
parent b91d23b0aecb3f5e840003844ccb5849be37b5c4
parent 8690a7317dcf64ece731e0f9e5fb2cdfb123b115
author Eiichi,Ohnishi <Eiichi.Ohnishi@sony.com> 1501014440 +0000
committer android-build-merger <android-build-merger@google.com> 1501014440 +0000

Merge "Use support level ZSL and Flash only when platform supports"
am: 8690a7317d

Change-Id: Ie6db06ce5747bab1f995a05a7aa624b0547e725a