tree 737c9ebd73ed60334200fb61beb56a6540d55805
parent 0f97b7874fe29f36e7a40d2fe4b45d1e0e24fe1b
parent f3b13b55df44ff23fdb184cd467dfd2b6d89074f
author Sunny Goyal <sunnygoyal@google.com> 1449539339 +0000
committer android-build-merger <android-build-merger@google.com> 1449539339 +0000

Merge "Adding FeatureFlags.java file to aggregate various feature definitions" into ub-launcher3-burnaby-polish
am: f3b13b55df

* commit 'f3b13b55df44ff23fdb184cd467dfd2b6d89074f':
  Adding FeatureFlags.java file to aggregate various feature definitions