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

* commit 'dee79f85b6c1a359bba1470864dd32a636e5c13b':
This commit is contained in:
Dan Albert 2015-08-27 11:48:56 +00:00 committed by Android Git Automerger
commit 6280d46475

Diff content is not available