Commits
Chet Haase authored and Android Git Automerger committed aca11c0cf40M
am 6dcffb43: (-s ours) am 4a2b3ef1: Merge "new assets" into gingerbread Merge commit '6dcffb434fff42b956b604e24a5b5728e721b686' * commit '6dcffb434fff42b956b604e24a5b5728e721b686': new assets
Showing diff to5e87e0d07dd