| commit | c7db50bb3fb494c96d9efb6d72ce614e3612bf9e | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Dec 08 11:28:57 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Dec 08 11:28:57 2017 +0000 |
| tree | 357d9e70cc17ca529f75ca1f92a1f70f71884583 | |
| parent | 93d7facd1beef843f55397c6db5ab605fbfbeb28 [diff] | |
| parent | e893545a771f17775f5ca97d44c1943669cc6825 [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into desugar am: 00ed747d46 am: e893545a77 Change-Id: I27f8b386aab61d169e210fefa122c25dca437d81