| commit | ce611065e0a3f766381c7eee6106e24d9d58adc5 | [log] [tgz] |
|---|---|---|
| author | Chris Banes <chrisbanes@google.com> | Mon May 04 22:19:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 04 22:19:49 2015 +0000 |
| tree | a4b508688f1a3817e630686058b7a5e8cbeba7af | |
| parent | 24502efdf76165e8bd35044e44737de8c6efbe46 [diff] | |
| parent | ce0734df1fffcd9c85530ae236a2a4aa7047ce7b [diff] |
am ce0734df: Merge "Don\'t inherit a parent\'s context if view is layout root" into lmp-mr1-ub-dev * commit 'ce0734df1fffcd9c85530ae236a2a4aa7047ce7b': Don't inherit a parent's context if view is layout root