| commit | d2117974e4c22ff6b8967c3b5cd2d497a6ffc856 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 30 16:33:50 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Jul 30 16:33:50 2015 -0700 |
| tree | 2c7a9153480c4423128ec1cfc1ef121d1f28a750 | |
| parent | 97d393bb2d7f2dad83a9e14f9a4aba5a018ef0b8 [diff] | |
| parent | 486645ee43de7be375a1150754a72798aaeb645b [diff] |
resolved conflicts for merge of 486645ee to mnc-dev-plus-aosp Change-Id: I027a4de6e4ebae3bee6b7d2e56bd39c284b8a062