| commit | fcc91b80ae77827726ab93d237f794f87b97a2e6 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Jul 24 12:38:06 2014 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Thu Jul 24 12:38:06 2014 -0700 |
| tree | 3fb49abf8e6eed4e8fd888b5233437015cc72292 | |
| parent | b8eb3ad343be4fbef8b90225f52f4776303289be [diff] | |
| parent | bebee4fd10e5db6cb07f59bc0f73297c900ea5f0 [diff] |
resolved conflicts for merge of bebee4fd to lmp-dev-plus-aosp