tree d8495221e55becfe25d24c5bf9e40c04d821bc63
parent 0784365a38fd5a9c08dd484f9ba549328d4dff97
parent b9a4701b152c297b09206854fef1ec0156c52fc0
author Stephen Hines <srhines@google.com> 1380238351 -0700
committer Stephen Hines <srhines@google.com> 1380238351 -0700

resolved conflicts for merge of b9a4701b to klp-dev

Change-Id: I9f7924c489d36913e130fd5e7617e3a96e65f1a1