commit | 7aaf04a54d6ba9219fa0c2292b4e0c549e9535a8 | [log] [tgz] |
---|---|---|
author | Jeff Brown <jeffbrown@google.com> | Fri Mar 14 17:53:28 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 14 17:53:28 2014 +0000 |
tree | d03ddcbf4641fa52b4039afe2debe443698f76da | |
parent | bb25d32514b110fb17793078b969eee2f2c4696a [diff] | |
parent | 5988ea8c2278fb2d042d2ad2459fb647d962f71f [diff] |
am 5988ea8c: (-s ours) am 88768cc3: am 6adc9602: am 825dd9dd: am 73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev * commit '5988ea8c2278fb2d042d2ad2459fb647d962f71f': Retain display when creating specialized contexts. (DO NOT MERGE)