| commit | 5273a978337cbee2c1aae2f4d5c1b0e9d8dd6e1c | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Mon Sep 08 22:15:20 2014 -0700 |
| committer | Dan Albert <danalbert@google.com> | Mon Sep 08 22:15:20 2014 -0700 |
| tree | 668ba5aff67786080794908d01ae27f2305d13bd | |
| parent | 0b12929fddd9a4b3c9a857ea360213ffd6e60ef2 [diff] | |
| parent | 86aeb9ef154d7aa63c58cbe5be62e5b61d6ae5fa [diff] |
resolved conflicts for merge of 86aeb9ef to lmp-dev-plus-aosp Change-Id: I82fe2b385156d9bdb9e7183e308d7b2a4167b6ce