| commit | 478bca2e728c108158fd68b469b3a48e2a432ad9 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Aug 25 11:16:36 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Aug 25 11:16:36 2015 -0700 |
| tree | 2af6362f66abaa3652dc81058a48f8f6e880ecd9 | |
| parent | 9c24c4410ce059c87f7dab9160442a340dbd2bbc [diff] | |
| parent | ba8fc8293f961cc380cec474c56d47155eded28f [diff] |
resolved conflicts for merge of ba8fc829 to mnc-dev-plus-aosp Change-Id: Ia4daf846df5a86ebca1b6c8d9e41f1633001836f