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

* commit '4c8f1d06752baab788e42371c3716977b9573107':
This commit is contained in:
Elliott Hughes 2015-08-27 14:33:57 +00:00 committed by Android Git Automerger
commit 35cca2971a

Diff content is not available