tree d41e154824f0b40f60ea2dce067ee5f47c6d6cbb
parent 1ab4088062ffdebbb82e5cf1fe9819fb6cc76555
parent 0ebe2f07c35d4b764bc5d8b5226004e3db46da91
author Hung-ying Tyan <tyanh@google.com> 1447951508 +0000
committer android-build-merger <android-build-merger@google.com> 1447951508 +0000

Merge "Add /odm/lib to shared lib search path"
am: 0ebe2f07c3

* commit '0ebe2f07c35d4b764bc5d8b5226004e3db46da91':
  Add /odm/lib to shared lib search path