tree ba7ade67b3796ee60cc45f2ad40b4f3e00352c6a
parent 7db4214bce9a9904986c9cbbd84904cb38873f9e
parent 96b3dee8e2896856baa00d51ee83dbf2a63908a9
author Aurimas Liutikas <aurimas@google.com> 1506707485 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1506707485 +0000

Merge "Revert "Move transition code to standard directories."" into oc-mr1-support-27.0-dev