| commit | 5acaa9dca07141f8123858fc76ce850b4dbbc813 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Tue Sep 29 01:52:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 01:52:46 2015 +0000 |
| tree | 44ccdfddc2ea7ca3b7c108868c29b6a8ecd42b22 | |
| parent | 5c3edc045b270ff32e0adaa20bd4cbb541d6b73a [diff] | |
| parent | 7ee3b85eba08304cb9e396aaf52a77729f125532 [diff] |
am 7ee3b85e: resolved conflicts for 953981db to stage-aosp-master * commit '7ee3b85eba08304cb9e396aaf52a77729f125532': Don't add dependencies on Makefiles when using ninja