OSDN Git Service

am e4c4311f: resolved conflicts for merge of c191a8ad to lmp-dev-plus-aosp
authorDmitriy Ivanov <dimitry@google.com>
Tue, 2 Sep 2014 17:39:36 +0000 (17:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Sep 2014 17:39:36 +0000 (17:39 +0000)
commita3dddd9ead934566c36993fc31db94b359994210
treeef60d8f1a3cf23bac7a2d02a976ecf0af9b09427
parent29dfcfda4bca15f340e908139eac67eb1922b14b
parente4c4311f4402d8f470b91500acf140baa7c4aa47
am e4c4311f: resolved conflicts for merge of c191a8ad to lmp-dev-plus-aosp

* commit 'e4c4311f4402d8f470b91500acf140baa7c4aa47':
  Look into ld_preloads before current library