| commit | c4e52d0ed9191be509d0bcabed3fcaeb42138be1 | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Wed Dec 10 16:22:00 2014 -0800 |
| committer | Dmitriy Ivanov <dimitry@google.com> | Wed Dec 10 16:22:00 2014 -0800 |
| tree | d9ea278e8ff3ec50cee5d54d65da7e8e60b2d0a1 | |
| parent | c627d61f2978d8e76ed8c9cc072884b8fe1a565b [diff] | |
| parent | 2b0f2dbefbc2b922d9ec3e940c9d475580bab45e [diff] |
resolve merge conflicts of 2b0f2db to lmp-mr1-dev-plus-aosp. Change-Id: I5cbcf74319afc3ae9d0e9280b572a59286565de8