tree e9e4cadbb6c58e175c6a8e688bdbc9b982fec9cf
parent 6ff81f0096f561bc7a3c2ab9f9bfd189608f1b49
parent 426244d6dc9976a59a981a9bde20e83141dad57b
author Andy Hung <hunga@google.com> 1496784458 +0000
committer android-build-merger <android-build-merger@google.com> 1496784458 +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

Change-Id: I384986ee486de0b5ac4bfdbba53c92e7dddfe0e8