OSDN Git Service

am 1c65e293: am ec463b96: resolved conflicts for merge of cc9894c8 to klp-modular...
authorJeff Brown <jeffbrown@google.com>
Wed, 12 Mar 2014 20:34:42 +0000 (20:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Mar 2014 20:34:42 +0000 (20:34 +0000)
commita8b65196d0a7535f49aa7faa26a23afef272fac3
tree357725e34c2bc5573c46bbb3a278c24462a12dcb
parenta7124cdd83723027f5880fa96f0c285a7615f3fa
parent1c65e293bd9646e8ca0dd6447c0bcb0889305273
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)