tree cb8c5b16f544f4183f28c3bec3a1657b2b6b41f8
parent c052d7e9c4744053f66a13f15ee945ad1ee30174
parent 2ae412019bd6fac53b5fb951a72d2250cb3372d9
author Android Build Merger (Role) <android-build-merger@google.com> 1502833083 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502833083 +0000

Merge "[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf am: 0fa9328b80 am: 51ca967453" into oc-dr1-dev-plus-aosp