| commit | 24e2c82765a40cb9b22903dbe96870cfeb18473a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Dec 01 00:54:56 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Dec 01 00:54:57 2016 +0000 |
| tree | dba6f32d80623441fe7565f2d2b11ba92de933b0 | |
| parent | 8dd60225ebc1a013efc90a50dc32eb90a05ba86d [diff] | |
| parent | d640e59d1d93e95ce96377b5deb67c3373b351ce [diff] |
Merge "resolve merge conflicts of 14afdcf to nougat-cts-dev" into nougat-cts-dev