| commit | 970766bc54900fe2e396670111b03bc3ffa332bf | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Dec 15 16:28:36 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Dec 15 16:28:36 2017 +0000 |
| tree | 0c22f124f5cf9949a124de963bc98d9dcb0bf96c | |
| parent | e128c69f6c5e20339d5acc19343b712f043888fc [diff] | |
| parent | 6b2f3e8f0fd630015034861affd69f8a99129e9c [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into desugar am: 28068806fa am: 6b2f3e8f0f Change-Id: Ie9cb7954709cdb7388a3c6731a834797d4d38059