| commit | bd28e2d9d3c2a7e80babd39471d5788843a48d4a | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Mon Jan 27 11:45:47 2014 -0800 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Wed Jan 29 16:50:40 2014 -0800 |
| tree | 02ea35ab547fcfb8f8c2522d4c5a784c383f0826 | |
| parent | f3560a133e3ec19c698a8c9d6cfc7d17fd95adc5 [diff] |
Manual merge of changes from klp-dev Manually merged the following changes from klp-dev branch and fixed merge conflicts: 78cfdf31b7c48589ea3a148ec1d6d573235bc06b d0581d271e814670d81a6550aa7b1e86864d5710 1f92d7fc0ffa72d7db93244c29a1a6575bb4b318 0baec410c29206dc72d9f5afba5d45827e62c00c 24541255c312ee34f9bf17eb5852cdffd4807065 Change-Id: I426729bb90a26746bfff3a0e4a03ea9f37972528