tree 2ef0fbf7a9a6077ed2ad31a2ee3a3bb505fd7eb9
parent 1c1d3116d95ee756150eea15d4586aae3b675c4d
parent f21d5b45801a4dd5c78e9786f1d567aaefbbfe95
author Andy Hung <hunga@google.com> 1496783274 +0000
committer android-build-merger <android-build-merger@google.com> 1496783274 +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
am: f21d5b4580

Change-Id: Ic809905d53a2443bc868894a029fd4625f006e87