Merge "Do not override odlparent properties"
authorTony Tkacik <[email protected]>
Mon, 16 Feb 2015 09:22:26 +0000 (09:22 +0000)
committerGerrit Code Review <[email protected]>
Mon, 16 Feb 2015 09:22:26 +0000 (09:22 +0000)

Trivial merge