| commit | 6eed5fc703dbc89dff8715e16c21f402d139189d | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Aug 04 20:44:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 04 20:44:58 2015 +0000 |
| tree | b6f2c14dce3ce6550c41eca8ed8901e88c6efb64 | |
| parent | 7d985ffb1e9e078d021e5ed1d62653f4d412fe7f [diff] | |
| parent | bd555f1523ec3faafe1e3c6cefce9fe0c96090c1 [diff] |
am bd555f15: resolved conflicts for merge of d86f39ca to stage-aosp-master * commit 'bd555f1523ec3faafe1e3c6cefce9fe0c96090c1': Ignore .*.java files when collecting .java files.