| commit | 435d9cde2777950c1d93b0982839d6796c5688b2 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Thu Sep 18 20:09:39 2014 -0700 |
| committer | Lajos Molnar <lajos@google.com> | Thu Sep 18 20:09:39 2014 -0700 |
| tree | cadfa7bfc3f2600949f8dbeeca01221528b0f801 | |
| parent | 556888b8ba32d923351bfb2317232dd78fff9c26 [diff] | |
| parent | 67d8bd66aaf04805cb8f2616ba964141b865e3b9 [diff] |
resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aosp Change-Id: I2e9aab90ac53bb32630598f50cc26f6e46acf6d6