| commit | 1e38a6c1e80b095ae526aa52c5cfc2ed30aad54e | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Fri Oct 24 14:31:48 2014 -0700 |
| committer | Dmitriy Ivanov <dimitry@google.com> | Fri Oct 24 14:31:48 2014 -0700 |
| tree | db9199af29a0d15ac74f0fc8615abfb35e7dc4c3 | |
| parent | de25b758a009188c5beb7daa45f4ce9e0e1e8951 [diff] | |
| parent | 04d38cf146d526479360dbcfd6b0e7889d27be91 [diff] |
resolved conflicts for merge of 04d38cf1 to lmp-mr1-dev-plus-aosp Change-Id: I6c376cd07860d23fc96bbddd68b2819baae2d17a