tree 091e4d7472b5a7f378b5b3cd5c0d638254357f37
parent d27f2d86d56aebf40ce64b6756a29e211c6895ce
parent 9ea4ab16199b24e2b21b68ff54d07a839c2ed784
author Android Build Merger (Role) <android-build-merger@google.com> 1465962766 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1465962767 +0000

Merge "Merge \\"Docs: Updated \\'NDK Apps Linking to Platform Libraries\\'\\" into nyc-dev am: ab62c65da9 am: eeee5156d3" into nyc-mr1-dev-plus-aosp