Commits


James Dong authored and Android Git Automerger committed 4ae577b3f08M
am 5e782937: am faf775e7: Fix simulator build (1st attempt) Merge commit '5e782937ead3042255d83f9c1192f2cc7b688d74' * commit '5e782937ead3042255d83f9c1192f2cc7b688d74': Fix simulator build (1st attempt)
Showing diff tofc6ed67f0a3