tree 5e3c0e09cae61cb0915990435eb5b14f61451377
parent 1b4a0abdbb7ff8218de7592301a7d5d2baab89cb
parent 5f04db96b3a397b7c1a96e2c768bdddab6080159
author Tobias Thierer <tobiast@google.com> 1508423112 +0000
committer android-build-merger <android-build-merger@google.com> 1508423112 +0000

Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os"
am: 5f04db96b3

Change-Id: If85216d03022708787a7218e494434453d5548e3