Merge "Rename file to satisfy strict Java requirement" into jb-mr1-dev

This commit is contained in:
Andy Stadler
2012-09-18 16:26:19 -07:00
committed by Android (Google) Code Review