tree 56ba87e8887c6c3f06de0eb0be1acfd5d743d099
parent 40833da7b919e2a6a6b1e5e4ed77a03ec86a4b26
parent ea83248dfb1822e0c0d507f38b13d90a9641261e
author Andy Hung <hunga@google.com> 1496782854 +0000
committer android-build-merger <android-build-merger@google.com> 1496782854 +0000

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

Change-Id: I0ceea1282ab530f228b8e6f54678edf3bb2f9d69