| commit | b8ac4940b84cba43f644c00f9df866e8068820c0 | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Sun Sep 14 14:49:07 2014 -0700 |
| committer | Mathieu Chartier <mathieuc@google.com> | Sun Sep 14 14:49:07 2014 -0700 |
| tree | 9bc78be32bb7d028ad3cf157e6a237b1b6bc6951 | |
| parent | adeacb3796d1c9c3ebf13041f90a9d58e57c1868 [diff] | |
| parent | 6b8ccf42e206869ee72b4372f56a8bb636737c6e [diff] |
resolved conflicts for merge of 6b8ccf42 to lmp-dev-plus-aosp Change-Id: I88d6ab9c33c4bbec754e8ba4ce8b296b38d52a84