| commit | 2858d2dffd1d9e1f2f14c33b24c1976d50756cc8 | [log] [tgz] |
|---|---|---|
| author | Alain Vongsouvanh <alainv@google.com> | Thu May 14 23:13:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 14 23:13:42 2015 +0000 |
| tree | 718742779582df51057375ea9ed8b20fb573de57 | |
| parent | d1e4d8b2cfbe0240253c40b13078daf3c104679f [diff] | |
| parent | a31763e3ca78df665244aa9b730368ff0755deae [diff] |
am a31763e3: resolved conflicts for merge of ace34a58 to lmp-mr1-ub-dev * commit 'a31763e3ca78df665244aa9b730368ff0755deae': Use ITestDevice#pullFile instead of ITestDevice#executeAdbCommand.