| commit | 4bdd5d97226bb2913fabe7f6bf4eeab20fd121a4 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:51:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:51:58 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 4bd8c0da432c72a1cf700df5fade8162b6541a81 [diff] | |
| parent | ea9fc4da13cb5d2b8c20647d10e4cf2791e49931 [diff] |
am 87538c8f: (-s ours) am 3cc101d6: am e329a3ec: Merge "Remove watchprops." * commit '87538c8f51bdd4a30e376ed34828f414f2e3cacc':