| commit | 538987da86aeff7895921f7c3f93da37e62113ec | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Mon Feb 23 19:15:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 23 19:15:50 2015 +0000 |
| tree | 72252af43866826e9b2b97c35dc4f2113bf751e7 | |
| parent | c586697bcb066ee688c349ca58eef2ee29b5551b [diff] | |
| parent | 99142d298213e93f673057c2334b04b38f7e4450 [diff] |
am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev * commit '99142d298213e93f673057c2334b04b38f7e4450': Set forceFramework correctly for included layouts.