| commit | 9bc0fe6ade2542e9e63439c342e1a59245ec1fbe | [log] [tgz] |
|---|---|---|
| author | Yusuke Sato <yusukes@google.com> | Thu Aug 27 11:52:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:52:04 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 5c898995022dd73797076fd352b94842ee00c408 [diff] | |
| parent | 8a75bd56983fd4b3c44daec6565e43f656022af3 [diff] |
am dd35a305: (-s ours) am 86ec2a88: am 162ec8e6: Merge "Ignore adb/*.pyc files" * commit 'dd35a30547249fa7654e771e13a0510f8a4cdc04':