commit | 5c9e47d28b249395fa74787065f83769b886c036 | [log] [tgz] |
---|---|---|
author | Tobias Thierer <tobiast@google.com> | Thu Oct 19 14:34:36 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 19 14:34:36 2017 +0000 |
tree | a00e09fd4c934c9daf97dd95ccb0f0a4cf23f988 | |
parent | 517b35fa1cc96afe0eb3cb889e1b765dd7cbce19 [diff] | |
parent | 07efe116b1055ebead525cc365f22114913a4e9a [diff] |
Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os" am: 5f04db96b3 am: 07efe116b1 Change-Id: I1c9f25ea1ac00037cc90dfe4c8c2552f90a33ecd