am 6280d464: am dee79f85: (-s ours) am fa3622b2: am c0e8d0fc: Merge "Fix AndroidDevice.get_prop, add tests."

* commit '6280d46475d83e530c772d648c848452e05615a7':
This commit is contained in:
Dan Albert 2015-08-27 14:30:26 +00:00 committed by Android Git Automerger
commit 22d26e8ca1

Diff content is not available