tree cdbd07f338dca91d6ab3ba604ff3d11ed0febcb8
parent b9f302c2f0b788a9beb250d0ada2ac3fbf368fc6
parent 4d76e5bcd6de1d15648190ca7508e7fb4d64467e
author Andy Hung <hunga@google.com> 1496783186 +0000
committer android-build-merger <android-build-merger@google.com> 1496783186 +0000

Merge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e98996 am: b401a3bf44 am: 1f44782e92 am: ea83248dfb am: 716d258db4 am: f043bb5da6
am: 4d76e5bcd6

Change-Id: If11f64ffbed4b890772eb2be984bb65c877199e4