| commit | 466a37489a053669edd7ae4c5f619411fff6a656 | [log] [tgz] |
|---|---|---|
| author | Vladimir Marko <vmarko@google.com> | Mon Jan 26 19:48:24 2015 +0000 |
| committer | Vladimir Marko <vmarko@google.com> | Mon Jan 26 19:48:24 2015 +0000 |
| tree | 2929093fb4f1dd0058e495bd74d7de57b73e1f92 | |
| parent | 18504239ff88f1a18c9040be1c7be59f5583aa3d [diff] | |
| parent | eac65e9812e0a4ad595de04d2342deb0c6ba7abf [diff] |
resolved conflicts for merge of eac65e98 to lmp-mr1-dev-plus-aosp