| commit | 413e662b238f60e0a1ff58e564b6bd8897502f9c | [log] [tgz] |
|---|---|---|
| author | Vladimir Marko <vmarko@google.com> | Thu Sep 11 18:27:39 2014 +0100 |
| committer | Vladimir Marko <vmarko@google.com> | Thu Sep 11 18:27:39 2014 +0100 |
| tree | d5c8249d3e077520305b8037605123b229dd46eb | |
| parent | dd6b91a12a7715191af2ae6feca388500174b1b9 [diff] | |
| parent | 5366c20d65ca9ad0c5cdc262cdf367bc2ee1ebad [diff] |
resolved conflicts for merge of 5366c20d to lmp-dev-plus-aosp Change-Id: I65defc92aa4fcb61f3ddcbfde2851dd3fd6f2336