am 87538c8f: (-s ours) am 3cc101d6: am e329a3ec: Merge "Remove watchprops."

* commit '87538c8f51bdd4a30e376ed34828f414f2e3cacc':
This commit is contained in:
Elliott Hughes 2015-08-27 11:51:58 +00:00 committed by Android Git Automerger
commit 4c8f1d0675

Diff content is not available