tree d5e55e0d4d3cb219a291c6ef3b80900553bd2808
parent db659e331e93097123c89ea2a33b65c7755c4570
parent 92564eeb43118c66ba99854ae98604ee74e0b0cc
author Aurimas Liutikas <aurimas@google.com> 1515013640 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1515013640 +0000

Merge changes from topic "am-b5a921e6-67fd-4cea-9b59-36ef925fb7da"

* changes:
  Merge commit '3196ef11607745931934a61db2a53e081479c546' into am-b5a921e6-67fd-4cea-9b59-36ef925fb7da
  Drop support for non ub-supportlib-* builds of support library.