tree 6ce36e00104f1e90a7f1a3cbf618b39cb02a98c4
parent 88de1bce27e208f2bea5a7aec53a52a2b37198da
parent 79c240e3d3347f9b5e0b1405e21b6b63ae8b06ef
author Elliott Hughes <enh@google.com> 1497556537 +0000
committer android-build-merger <android-build-merger@google.com> 1497556537 +0000

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

Change-Id: Ia7e3785d5cf3283b974f048bbbebcf8ff2ed557a