| commit | e9794e53713387acd5593d143976d5cdd0bc968c | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:33:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:33:57 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 58ceb2de14301f660dabbb4d0f00bd1bfa9c4d76 [diff] | |
| parent | 4bdd5d97226bb2913fabe7f6bf4eeab20fd121a4 [diff] |
am 4c8f1d06: am 87538c8f: (-s ours) am 3cc101d6: am e329a3ec: Merge "Remove watchprops." * commit '4c8f1d06752baab788e42371c3716977b9573107':