merge in KQS81M
authorEd Heyl <edheyl@google.com>
Tue, 8 Oct 2013 22:43:40 +0000 (15:43 -0700)
committerEd Heyl <edheyl@google.com>
Tue, 8 Oct 2013 22:43:40 +0000 (15:43 -0700)
commit60ebc6a849e5f12169558465216ec3900a289c8b
treedacf4b675ec8f111b3187535076a27498acd81a4
parent9b6bb99520cd6252443b5c800f7f9f73ed272f54
parent1373031fac29b1d32c9cc5e6403e386f2231caf0
merge in KQS81M