| commit | e5280489b5d2ae4acae5396365a13848cc133250 | [log] [tgz] |
|---|---|---|
| author | Lee Campbell <leecam@google.com> | Thu Aug 27 14:29:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:29:22 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 6e980d84c81219d2e5b154d7b786101050f01b27 [diff] | |
| parent | 4d0f40755b8867c7d2c592b5b8f0d89d3a4a6dc5 [diff] |
am cc2b8022: am 42f669a1: (-s ours) am f75b5ff1: am fe39394e: Merge "init: Adding support to import directories" * commit 'cc2b8022ccb7d501c7317fc37e251b9f81e39cfc':