ref: 3818132a4bdc77aec5993ea813c1ff1cdc70aec9
parent: 91b5145673c3e660ec98ab99c8613666108948d0
parent: 0eecccc51eccd4a030c88e0a4f50af4bd6419bdc
author: Jingning Han <jingning@google.com>
date: Wed Feb 12 12:51:30 EST 2014
Merge "Remove inactive control parameters"