| commit | 8f022fd323063f9cebb481be650db40cf5e486f3 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Mon Feb 23 19:22:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 23 19:22:31 2015 +0000 |
| tree | a594b464fadc398c4cafc6f8a39f6469bf05f20c | |
| parent | 84e40b1f338eba0a352a6bf3a0f2801c21e17d59 [diff] | |
| parent | 5ed4fc9efda45d2411b8b9bc8cab55b8e270b13c [diff] |
am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev * commit '5ed4fc9efda45d2411b8b9bc8cab55b8e270b13c': Set forceFramework correctly for included layouts.