| commit | b5d5099737c0ca7faa6f155860a29128755c50a4 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Aug 27 14:30:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:30:26 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 3621ad5139ea05b52d7dad666f7ca66f6a64f707 [diff] | |
| parent | f3b50762792c86294ba108f578ee59c1072bd752 [diff] |
am 6280d464: am dee79f85: (-s ours) am fa3622b2: am c0e8d0fc: Merge "Fix AndroidDevice.get_prop, add tests." * commit '6280d46475d83e530c772d648c848452e05615a7':