| commit | fac19af0dddba4ed59862849eb004e740359fdb6 | [log] [tgz] |
|---|---|---|
| author | Chenbo Feng <fengc@google.com> | Mon Jul 17 21:16:51 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 17 21:16:51 2017 +0000 |
| tree | 770325cb33542219a8221fef4818c597b59f735c | |
| parent | 074684af9649edfc923f7cf99bc7acfd621e1443 [diff] | |
| parent | 26339f2d7776078710591bce0fdd4c6099a03787 [diff] |
Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev am: 26339f2d77 -s ours Change-Id: I14d800f7b51293e055d77611ee77131586efd384