am: e95ba66be0 * commit 'e95ba66be00090a9fba1e74cba3504e67177bdf4': Use Java7 diamond operator in TSMS.
e95ba66be0