tree a161a9df9643c70d975d45dfcc128d662b83bcb6
parent 5222b5f2a7f1e984aff5a4a714a86f99230bea6c
parent b6b875a0ab0108021a756d95b85004ce0eca395c
author Christopher Ferris <cferris@google.com> 1480373521 +0000
committer android-build-merger <android-build-merger@google.com> 1480373521 +0000

Merge "Add cortex-a7 specific routines." am: 8c8cd2f3be am: cc8a4201a2
am: b6b875a0ab

Change-Id: Id08e0d2b9057e58d87aca93e08641493e50d77b1