| commit | a8b65196d0a7535f49aa7faa26a23afef272fac3 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Wed Mar 12 20:34:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 12 20:34:42 2014 +0000 |
| tree | 357725e34c2bc5573c46bbb3a278c24462a12dcb | |
| parent | a7124cdd83723027f5880fa96f0c285a7615f3fa [diff] | |
| parent | 1c65e293bd9646e8ca0dd6447c0bcb0889305273 [diff] |
am 1c65e293: am ec463b96: resolved conflicts for merge of cc9894c8 to klp-modular-dev-plus-aosp * commit '1c65e293bd9646e8ca0dd6447c0bcb0889305273': Retain display when creating specialized contexts. (DO NOT MERGE)