| commit | d9799072de47ecd3e6d4cdb2bfd3db75f4d94bd5 | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Wed Dec 10 16:10:44 2014 -0800 |
| committer | Dmitriy Ivanov <dimitry@google.com> | Wed Dec 10 16:10:44 2014 -0800 |
| tree | 1660c41dfda961f593906bf8c9431af38b6407da | |
| parent | b93bca5d0831068cd599f905ba43dc8334095d65 [diff] | |
| parent | e9b6f1f7bb590a3f9845a150c1e9286c8ad48bfe [diff] |
resolved conflicts for merge of e9b6f1f7 to lmp-mr1-dev-plus-aosp Change-Id: I87618573198d1f476b1680dbf9163a7dc90a66f8