| commit | e2dd5df508669ee3743138fc35893001cde4fe11 | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Thu Sep 11 11:26:01 2014 +0200 |
| committer | Sebastien Hertz <shertz@google.com> | Thu Sep 11 11:26:01 2014 +0200 |
| tree | c924cde1beaab5180a496616128678dc7784ac52 | |
| parent | f8459df0dec144090c712f690f6b3c17e65ff40f [diff] | |
| parent | 223390fd81f6bcff0811e5d5fee98948181fe7b3 [diff] |
resolved conflicts for merge of 223390fd to lmp-dev-plus-aosp Change-Id: I889e3e4b1bf9ac5a699c962341d71633294b40c6