tree e0676490f8db47110ddb9f0bc16ea49d7a8048ec
parent df4d2a68d9c6d3c298469c4b50075cc7ea3c1739
parent 951f4af9ce72effa3205905bfece8a09f95ad20c
author Elliott Hughes <enh@google.com> 1505783754 +0000
committer android-build-merger <android-build-merger@google.com> 1505783754 +0000

Merge "Support larger guard regions." am: dacbb04cde
am: 951f4af9ce

Change-Id: Ic7aca07ab341ab2ddb7e89d2c6b61bb1096a5574