summaryrefslogtreecommitdiffstats
path: root/opengl/java
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2013-09-24 17:31:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-24 17:31:57 -0700
commitf77c1eb1e0160364bb23972238952ee4f7b08c29 (patch)
treeaecf7e3af85dd4f12c05b6068aa06366b8a5a1e7 /opengl/java
parent6dda4984cf636c2804ee6c6b109bcbb69d4baa04 (diff)
parent8488f9fa2e38e75e7ecbaac7d776900f8f1e5917 (diff)
downloadframeworks_base-f77c1eb1e0160364bb23972238952ee4f7b08c29.zip
frameworks_base-f77c1eb1e0160364bb23972238952ee4f7b08c29.tar.gz
frameworks_base-f77c1eb1e0160364bb23972238952ee4f7b08c29.tar.bz2
am 8488f9fa: Merge "Be less aggressive when not resuming top activity" into klp-dev
* commit '8488f9fa2e38e75e7ecbaac7d776900f8f1e5917': Be less aggressive when not resuming top activity
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions