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