merge in KQS81M
authorEd Heyl <edheyl@google.com>
Tue, 8 Oct 2013 22:40:51 +0000 (15:40 -0700)
committerEd Heyl <edheyl@google.com>
Tue, 8 Oct 2013 22:40:51 +0000 (15:40 -0700)
commitfa5c44e9d2a21d069fb166ce799bcba972062b67
tree1a6a1121a40d3079c468c0333ccc034a90a9fc86
parent002b8c6f5095a36bd09f2b6de6c4b3e1125c6158
parent4e58395d0fc3da669b8c08836285c3573dcbd2b9
merge in KQS81M