tree 10caf6302f8551bded5045c49f7f5ad88ba4fc50
parent 48475bf5310ecd71025ed8c134b30b49547604d9
parent 1bc89a26ce7ac42662c4870eab93d23f41ebf72c
author Steven Moreland <smoreland@google.com> 1565341480 -0700
committer android-build-merger <android-build-merger@google.com> 1565341480 -0700

Merge "libbinder_ndk: __ANDROID_NDK__ canary"
am: 1bc89a26ce

Change-Id: I9402033210c3af5dd03446abd70ce8f1a96681c0