Merge "Code reformatting for upcoming automated code changes." am: 3b2cd9244d

am: 0c875607f0

Change-Id: Id046871cf4b42b33dc2723c0ae294fe9706891f7
This commit is contained in:
Mathew Inwood
2018-08-21 08:45:37 -07:00
committed by android-build-merger

View File

@@ -35,7 +35,8 @@ public final class Scene {
private int mLayoutId = -1; private int mLayoutId = -1;
private ViewGroup mSceneRoot; private ViewGroup mSceneRoot;
private View mLayout; // alternative to layoutId private View mLayout; // alternative to layoutId
Runnable mEnterAction, mExitAction; Runnable mEnterAction;
Runnable mExitAction;
/** /**
* Returns a Scene described by the resource file associated with the given * Returns a Scene described by the resource file associated with the given