tree 9aaa047d94df289cd8c66d4eee8c690692afd559
parent 6d3d6c4a06a1e83d126622d8a971f439b80ec354
parent 6adc96020f763289d2e2a33b612f2ff237fb40b6
author Jeff Brown <jeffbrown@google.com> 1394814719 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394814719 +0000

am 6adc9602: am 825dd9dd: am 73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev

* commit '6adc96020f763289d2e2a33b612f2ff237fb40b6':
  Retain display when creating specialized contexts. (DO NOT MERGE)