tree d62075ead3b7f96f2fa43b43494ff10445591b26
parent feecaecca15dbd5fa5bada81296692b8363f8332
parent c47adacb0d66de0fd71a79809b8c80489e3414e8
author Andy Hung <hunga@google.com> 1496784669 +0000
committer android-build-merger <android-build-merger@google.com> 1496784669 +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 am: 426244d6dc
am: c47adacb0d

Change-Id: I1ef1fd980140139ecd9322fc15d9c6e2f8b85c84