tree ba06e21204766301daa4ffa067297f1bd2178cf6
parent 6e29efea3791e38b3a76a3b986c4e44c564f4d7a
parent 29f28f46ae9f921580ccfa8f2eacfef41537af34
author Elliott Hughes <enh@google.com> 1497557071 +0000
committer android-build-merger <android-build-merger@google.com> 1497557071 +0000

Merge "Remove device.get_props." am: e79b9969d6 am: 79c240e3d3
am: 29f28f46ae

Change-Id: I038bd5076be4ad0f9754e602c038b78d1f8b1694