tree 2f07a8ef7ebe04f5c4f84b96f760124cc226e8a7
parent 85be63e69973148e3b9d144691ea7187f8d88527
parent 72f9161b75686ff3377387e14f437bae9c942f6a
author Sunny Goyal <sunnygoyal@google.com> 1464128807 +0000
committer android-build-merger <android-build-merger@google.com> 1464128807 +0000

Merge "Separating out configs and common manifest entries" into ub-launcher3-calgary
am: 72f9161b75

* commit '72f9161b75686ff3377387e14f437bae9c942f6a':
  Separating out configs and common manifest entries

Change-Id: I80d51641b6432c762bcb4f34efb3e27b96c0e168