am 86c178a8: am 1fd241b3: Merge "Project-lib sample: externalize strings in lib." into froyo