tree 6ba4bc42eb82f2805e453a5c25cdf4c18e270a03
parent 2e781bb778920db38009348bd75a2d35938c1b55
parent 0529fdaedfce6209d7292b01c35d8034650bd9cd
author Eiichi,Ohnishi <Eiichi.Ohnishi@sony.com> 1501014881 +0000
committer android-build-merger <android-build-merger@google.com> 1501014881 +0000

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

Change-Id: Id18345701037b6306f2fec8dc233cd2fb1760833