tree 3d81dcbe1be595f3de8ecc70c377c54f442a5fbd
parent 9428814b8e57e0562235776927c0d3ed99f73f2c
parent 9ba3f6db392f0f9b25cc5b3ad03c984fdc76094f
author Colin Cross <ccross@android.com> 1461106268 +0000
committer android-build-merger <android-build-merger@google.com> 1461106268 +0000

Merge "Update sanitize property format" am: 0652728
am: 9ba3f6d

* commit '9ba3f6db392f0f9b25cc5b3ad03c984fdc76094f':
  Update sanitize property format

Change-Id: I7ac818440c50c7166921d74dfb3b6c10af19ee09