| commit | 36a32cd68365b8cefea7669ed925cf5387a3b53a | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Fri Jun 20 22:38:20 2014 -0700 |
| committer | Joe Fernandez <joefernandez@google.com> | Fri Jun 20 22:38:20 2014 -0700 |
| tree | 41b716a22ec2df7c6b0b83e12c01675e535eec9a | |
| parent | b6bca953909d42a6284de4128d767eff8c9862ee [diff] | |
| parent | 9560aaec8a5213f025677463ce3ee18d8bafb100 [diff] |
resolved conflicts for merge of 9560aaec to klp-modular-dev Change-Id: I137c56182c00bca6f427bff5324db765017cf5ec