tree 660c560808d7447a5589be48f180ed6c1a409fdf
parent ce15503bf97ce997cd1749a346cd372174fa2659
parent 158ec15776e037711632ba820b0360040e36f9cd
author Andy Hung <hunga@google.com> 1496783995 +0000
committer android-build-merger <android-build-merger@google.com> 1496783995 +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 am: f0221a7dbe am: b26594e6ae
am: 158ec15776

Change-Id: I8f95b5d6e62dfef4edfd991b56c51e056081f452