| commit | d61d2b7b8037ba3f7eb97af545daaa3e267c2638 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Mon Oct 06 16:30:45 2014 -0700 |
| committer | Christopher Ferris <cferris@google.com> | Mon Oct 06 16:30:45 2014 -0700 |
| tree | cb9d8fd450889ecbdefc00519cf2e0519ea29086 | |
| parent | 65c10a1477c5ccc68000eed4a3314bb95bb6bcb9 [diff] | |
| parent | d11eac3455a059a092ceee92eda9905e1d661e94 [diff] |
resolved conflicts for merge of d11eac34 to lmp-dev-plus-aosp Change-Id: I3cd9056d5d689b783f4afa870397ad4d9de357f5