tree e29c91c5d30b262d395dde608c6cc441210e7f14
parent 7aa70a8fdd51b1c6d616e0d647e0285186117f6f
parent ecf8efbde5d6fdbf5ba3b78442ce01197c78e9ac
author Colin Cross <ccross@android.com> 1461107217 +0000
committer android-build-merger <android-build-merger@google.com> 1461107217 +0000

Merge "Update sanitize property format" am: 68bb6e4 am: b132bdd am: c0e584ee5d
am: ecf8efbde5

* commit 'ecf8efbde5d6fdbf5ba3b78442ce01197c78e9ac':
  Update sanitize property format

Change-Id: I454e34a431ae6b62fead29fb9bce8fef93dc80c5