| commit | 2109d0065c4c277ae1435d549b7184c1f8ef5c8e | [log] [tgz] |
|---|---|---|
| author | Hugo Arès <hugo.ares@ericsson.com> | Mon Jun 11 13:00:45 2018 -0400 |
| committer | Hugo Arès <hugo.ares@ericsson.com> | Mon Jun 11 13:00:45 2018 -0400 |
| tree | 956d12097a15b749d746b7229ed01e3ef07943db | |
| parent | 88c4ee0d9cba6bedf173195cbedee8b9292ad13c [diff] | |
| parent | e5a87d2cae1e7aee85c85745772a545270f560fb [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Change copyright to AOSP Format Java files with google-java-format 1.6 Change-Id: I871e1ae81ec6cb7861b7cc4b0da5845c1a997f74