| commit | e7bda06398f09d0a28557fcf550ece2c8bb1eb80 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Thu Sep 18 20:05:27 2014 -0700 |
| committer | Lajos Molnar <lajos@google.com> | Thu Sep 18 20:05:27 2014 -0700 |
| tree | 500055bbdfa62ae5cda51fb136987afa19aee901 | |
| parent | 1a0059efa085d70297822cf58edac63c4aa0666e [diff] | |
| parent | 67d8bd66aaf04805cb8f2616ba964141b865e3b9 [diff] |
resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aosp Change-Id: Idbe39c6de8fe31ac57a9238c18b4c20d66dc73ad