tree 51dc21f308d3212ac3c01334b617a963af33c255
parent 9b0ce863d33147153b45ffc2fc58d0cf4a10be63
parent 5aaf5543e40d87ae714abdce98dcf890579ff828
author Martijn Coenen <maco@google.com> 1493392239 +0000
committer android-build-merger <android-build-merger@google.com> 1493392239 +0000

Merge "Validate incoming data properly." am: 5718b01b9a am: 4fcfe05707
am: 5aaf5543e4

Change-Id: I841e1f420a3e5f37839aa840fa7a88de6257772a