tree a31468557785d96a978807ddf3179b2193c1f4d5
parent 946e2bd60a5b73050204e546fa1dc850f399dfed
parent 95a0d91f672baaf7d37400555df45d8eccb877e6
author Lazar Trsic <Lazar.Trsic@imgtec.com> 1468435497 +0000
committer android-build-merger <android-build-merger@google.com> 1468435497 +0000

Merge \\\"[mips] Resolve issue with .align directive, when using clang IAS\\\" am: febb7ea6a0 am: bf8f1cdaf0
am: 95a0d91f67

Change-Id: I7941a9d09abddfc4ebf94bbec08243ef56a92bb1