| commit | 4d0f40755b8867c7d2c592b5b8f0d89d3a4a6dc5 | [log] [tgz] |
|---|---|---|
| author | Lee Campbell <leecam@google.com> | Thu Aug 27 11:46:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:46:35 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 96f50757ab128bce1a352b256500d2c76b3f612a [diff] | |
| parent | 32a6121af30d71d989ee2a47664687eee0e98c5f [diff] |
am 42f669a1: (-s ours) am f75b5ff1: am fe39394e: Merge "init: Adding support to import directories" * commit '42f669a144e2b92ff7473f802af66cd65dfd2a68':