tree 05f577b71fb4938773d501cf18e6a8d1a1f473f6
parent f68d4fe7de57be8138f433b63490c5c25cd4c2b5
parent 7a646707fe2828b81766055d0e64b157f3e5795e
author Alexey Polyudov <apolyudov@google.com> 1470176961 +0000
committer android-build-merger <android-build-merger@google.com> 1470176961 +0000

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

Change-Id: Iae48f8df8818e9261a780b3e54f92e1b518cf2ac