tree 274e4540b6463515c6d5963870152b408f1acd83
parent 226a32ec6c163b6d1c9374a2e491c53a24001410
parent b502d57d7fc48a686f5958f1c57a3df744ae6a16
author Evgenii Stepanov <eugenis@google.com> 1502930839 +0000
committer android-build-merger <android-build-merger@google.com> 1502930839 +0000

Merge changes from topic "cfi-shadow-size" am: fc89237b77 am: 62adbbf5e8
am: b502d57d7f

Change-Id: Iae564df666c4f0792fcb0d5efaa6ed1175cf3e9a