summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Scott Main <smain@google.com> 2011-12-15 19:57:21 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-12-15 19:57:21 -0800
commit2538d4a55c1bce3302774191eb8986bbdf3dc543 (patch)
tree859ffe41ea024ac5a3e5736dd725641f660dc932 /libs/ui/FramebufferNativeWindow.cpp
parentd44f07e968a3323562646d6b07cfc7208a1cb78d (diff)
parent98e4adf942fe3ade14225875fdb018efe941e99f (diff)
am 98e4adf9: am 26e461b3: am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
* commit '98e4adf942fe3ade14225875fdb018efe941e99f': Doc merge from master:Training class on Identifying and Authenticating Users.
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions