| commit | f3b50762792c86294ba108f578ee59c1072bd752 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Aug 27 11:48:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:48:56 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 357de1a823f5872cd5a0f920e896fb3551eb3f82 [diff] | |
| parent | 5afe08bf6a9c239c8ebb16dc77cc0873cab22d94 [diff] |
am dee79f85: (-s ours) am fa3622b2: am c0e8d0fc: Merge "Fix AndroidDevice.get_prop, add tests." * commit 'dee79f85b6c1a359bba1470864dd32a636e5c13b':