| commit | 54da38e3efd6213815b8eea5fe23bfdc05981124 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Nov 15 08:13:05 2014 -0800 |
| committer | Nick Kralevich <nnk@google.com> | Sat Nov 15 08:13:05 2014 -0800 |
| tree | c365e22ab58bbe1465c6808161fd3e1ed5ebca6f | |
| parent | 72dd088e9050bd4a9c7944811fa67017eb5180db [diff] | |
| parent | a477bbb62ba197815d840d07708526a2bb9c8b4d [diff] |
resolved conflicts for merge of a477bbb6 to lmp-mr1-dev-plus-aosp Change-Id: I600b53d1024aefc2e5bb169c0cd2a25cb23c9cd4