| commit | 82407825c3e55e71a6b656df24bb8f258c80041b | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Aug 04 20:55:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 04 20:55:15 2015 +0000 |
| tree | dac56d68501f568b38978d4db55799717266fae0 | |
| parent | 082b8ecb7bbb76428e0ec1a2156ae086c1546acd [diff] | |
| parent | d2d3024292278a0a0723c901bee71c362735d6b1 [diff] |
am d2d30242: am bd555f15: resolved conflicts for merge of d86f39ca to stage-aosp-master * commit 'd2d3024292278a0a0723c901bee71c362735d6b1': Ignore .*.java files when collecting .java files.