commit | c87481890555f1874345fc6cd401e1286bab75ca | [log] [tgz] |
---|---|---|
author | Nikola Veljkovic <Nikola.Veljkovic@imgtec.com> | Thu Jul 14 00:52:48 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 00:52:48 2016 +0000 |
tree | 71b69300f9cc2f35bfa7ca71009e1d6e6a195c8e | |
parent | 26ba155ced8f48e2039d5607aa24a9123b07fcf5 [diff] | |
parent | 8ba8b2fb18395c69d05d69c5a5d341c2e450dbb9 [diff] |
Merge \\\\"Replace .align with .balign to avoid ambiguity\\\\" am: 78ea54f735 am: b36ebd0593 am: 3d43ef9135 am: dd3bbdae82 Change-Id: Ifbf7332ed0b9e8182fb6accc6c509cb805a53d4c