summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author The Android Open Source Project <initial-contribution@android.com> 2012-10-12 07:31:00 -0700
committer The Android Open Source Project <initial-contribution@android.com> 2012-10-12 07:31:01 -0700
commitc5a70b1d2474f47929658b90f51390de700d64c0 (patch)
tree94c810fb99bcb7cd06610ef36d4d4e3c88bf0166 /libs/ui/FramebufferNativeWindow.cpp
parentf5b27f714063361d07a7ca6f107bba3e13b75d38 (diff)
parent8b4053a1aa0de3266ab6e23022d14265b54d2afa (diff)
parenta58b6a4bcd0c2877694fc0800852ab58f2e78604 (diff)
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I38012327dc2f36e7e2a6773a2e1dfc49be6475ad