merge in KQS81M
authorEd Heyl <edheyl@google.com>
Tue, 8 Oct 2013 22:42:57 +0000 (15:42 -0700)
committerEd Heyl <edheyl@google.com>
Tue, 8 Oct 2013 22:42:57 +0000 (15:42 -0700)
commit6741f03cc7f1d58024eae18f34d633a2ae9f49fb
tree4b825dc642cb6eb9a060e54bf8d69288fbee4904
parente0f77d75e62014630ded8bd24350121f3eba5d34
parentec24812c789dd09f7905cb1d4618baad216597e3
merge in KQS81M