tree 6cb3566c253390a30d7e648710f3922a7d21e477
parent b7987ce8c4e2d4c1dbb5846de105732cabee3c78
parent 8d302763aba8a48e3d4a4743933c7b85c659b32f
author Elliott Hughes <enh@google.com> 1487816236 +0000
committer android-build-merger <android-build-merger@google.com> 1487816236 +0000

Merge "Address property service DoS."
am: 8d302763ab

Change-Id: I61da77b9d380ecc4a552aab1138de0c838dfb401