tree 78a48ad9eb482a6b8944900b157dcf0fee327714
parent 357902b9de2d6e70a11b2cb0c808cea971c25f3b
parent 991c8403131dc5781d3d4a1d10d292dc99fee202
author Dan Willemsen <dwillemsen@google.com> 1454122148 +0000
committer android-build-merger <android-build-merger@google.com> 1454122148 +0000

Merge "Order objects based on LOCAL_SRC_FILES and LOCAL_GENERATED_SOURCES" am: 224466b1af
am: 991c840313

* commit '991c8403131dc5781d3d4a1d10d292dc99fee202':
  Order objects based on LOCAL_SRC_FILES and LOCAL_GENERATED_SOURCES