| commit | d2d3024292278a0a0723c901bee71c362735d6b1 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Aug 04 20:42:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 04 20:42:56 2015 +0000 |
| tree | eb462c1a9ed2b55ad1cec49fb68a446ff84d2a37 | |
| parent | f2ee86d1712edf1c5b1b5b920883b037c661ab4f [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.