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