summaryrefslogtreecommitdiff
path: root/libs/hwui/Program.cpp
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2014-03-28 22:16:33 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-28 22:16:33 +0000
commit9395dab7c38d540bea926307c448d5cc5032ac7d (patch)
tree7e27341fc9e1fa3cb88d6547aee5e82a9c89921a /libs/hwui/Program.cpp
parentaee03bb1a1077427c918ad9fea5fdd1ab204f60e (diff)
parentff3362f0d8378d616f39cbcf8b86b6f03e7d30b9 (diff)
am ff3362f0: (-s ours) Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front."
* commit 'ff3362f0d8378d616f39cbcf8b86b6f03e7d30b9': DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.
Diffstat (limited to 'libs/hwui/Program.cpp')
0 files changed, 0 insertions, 0 deletions