| commit | cba06c2272c8bce7d10b2a7ee762d12043f3252a | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Mon Nov 10 19:41:52 2014 -0800 |
| committer | Andreas Gampe <agampe@google.com> | Mon Nov 10 19:41:52 2014 -0800 |
| tree | 284f68b6b7a5d04df2b796ebe2af8ccce1d807ec | |
| parent | 6ba4c9d91bfcd2acf3ad85db0a7945438ab4548c [diff] | |
| parent | 6957369d137c1dead21a653ad902ae589bb7e51f [diff] |
resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp Change-Id: Ie3bd0e24c69c0c7ae500b8eb4a1198650e993a19