merge in KQS81M
authorEd Heyl <edheyl@google.com>
Tue, 8 Oct 2013 22:41:54 +0000 (15:41 -0700)
committerEd Heyl <edheyl@google.com>
Tue, 8 Oct 2013 22:41:54 +0000 (15:41 -0700)
commit4ed83a2b6839be1c7b45db8ed8d54250f00fb65d
tree14a44eb0e8ec981593900a05c2fa38c7bdc24e8e
parent877105063c2a4f9050ea899fcff3843f39050ec6
parent3feb4c1f1732e592f2b3cddf0e0a099699a4e509
merge in KQS81M