tree 5624158e3cc362a82c25bae31b3342fea1a3ac93
parent 999a1ca984ec0877c795433e6f1baa6cd5853aac
parent 95731abeae49eac57911068ac8545f4eba2ae58d
author Adam Lesinski <adamlesinski@google.com> 1412182938 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412182938 +0000

am 95731abe: am bb7b5197: am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev

* commit '95731abeae49eac57911068ac8545f4eba2ae58d':
  Fix issue with using locally defined attrs in a shared lib