tree 4620a44d144b9b782f1561a48f647d6aba3cd3e4
parent 6e9a89c5c69a76a99b6bda8cb6060bc9c71ac7de
parent 1eba5a69ebcbf550a1fde3526dc7ed00b48ec770
author Alexey Polyudov <apolyudov@google.com> 1470176394 +0000
committer android-build-merger <android-build-merger@google.com> 1470176394 +0000

Merge "Add LOCAL_NO_PIC to disable position-independent code" am: ce5900a6e0
am: 1eba5a69eb

Change-Id: Ie385a2eb668137e51ba17ecdaa44a1518dea2638