| commit | e18d68d6ab2f5354441162719ec87cb57de83519 | [log] [tgz] |
|---|---|---|
| author | Adam Powell <adamp@google.com> | Thu Oct 02 12:38:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 02 12:38:21 2014 +0000 |
| tree | 2cb0e8c9128ce020d36f04c03fecde706d9f2035 | |
| parent | 30c284fc460218652ffa89aed3da41225ad9b7cc [diff] | |
| parent | 4e789dbff0bc4d9c259a33d6e8ea595c0f4d5f35 [diff] |
am 4e789dbf: am 8628387c: am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev * commit '4e789dbff0bc4d9c259a33d6e8ea595c0f4d5f35': Revert "Fix issue with using locally defined attrs in a shared lib"