| commit | 748b31ab428fe984e7975c41a5100a23275a8315 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Tue Dec 19 18:25:00 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 19 18:25:00 2017 +0000 |
| tree | 0c22f124f5cf9949a124de963bc98d9dcb0bf96c | |
| parent | 4552d61047e1aa91364c3a02d43a620b46bb6d53 [diff] | |
| parent | bbd7d2e2c365b12f9581b6f16ab39ee519a0e2af [diff] |
Revert "Revert "Merge remote-tracking branch 'aosp/upstream-master' into desugar"" am: 0156e0d255 am: bbd7d2e2c3 Change-Id: I039388f5f5045e9385461c60efbca732f1bce254