tree ce591ef44b9d6baf9e57825c51ef6306661a15a6
parent bd533c8d42f8f2255496935826eb627059b2b5eb
parent 86ac9448df6bf992081632d402f6dfeeafda2422
author Filip Pavlis <pavlis@google.com> 1526673060 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1526673060 +0000

Merge "Update mappings in Jetifier." into pi-preview1-androidx-dev