| commit | 1e2bec489ca1e27bb4765aca947cd46f288eb9d9 | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Tue Oct 14 10:50:59 2014 -0700 |
| committer | Dmitriy Ivanov <dimitry@google.com> | Tue Oct 14 10:50:59 2014 -0700 |
| tree | 436cabcb93d077685a6576e070b12bb217d3f7c2 | |
| parent | badcdc7a532552f6bfa082059752eaef699947dc [diff] | |
| parent | 3f95c89db68f4d609c0ccafa4e9e7376852c9b48 [diff] |
resolved conflicts for merge of 3f95c89d to lmp-dev-plus-aosp Change-Id: I5184dcfa91a11a210c60e60a4fffc26d2c9f116f