| commit | 29e2e5d2d5815e308443f0fffee18dd1b528968b | [log] [tgz] |
|---|---|---|
| author | Adam Powell <adamp@google.com> | Thu Oct 02 12:52:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 02 12:52:38 2014 +0000 |
| tree | 49d4868ab013d45bdb26084005db35f16c930a3b | |
| parent | 9db0d62d96243447960e0d9732e8033ba183b5ce [diff] | |
| parent | e18d68d6ab2f5354441162719ec87cb57de83519 [diff] |
am e18d68d6: 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 'e18d68d6ab2f5354441162719ec87cb57de83519': Revert "Fix issue with using locally defined attrs in a shared lib"