summaryrefslogtreecommitdiff
path: root/libs/hwui/DeferredLayerUpdater.cpp
diff options
context:
space:
mode:
author Greg Hackmann <ghackmann@google.com> 2014-02-22 00:42:52 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-02-22 00:42:52 +0000
commit5f652b9fdfbcc279353955f7ef86b72d2ef9f5fb (patch)
tree3034ba6466cc2b82d33fb769a97530ad0962b264 /libs/hwui/DeferredLayerUpdater.cpp
parent542b55d9a4bee2f98f8a0a6948e0873c5faaddc7 (diff)
parent0cab896a987f6687affd5c50c3bdbe10745c8dff (diff)
am 0cab896a: resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp
* commit '0cab896a987f6687affd5c50c3bdbe10745c8dff': open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal Move time setting code from SystemClock to AlarmManagerService
Diffstat (limited to 'libs/hwui/DeferredLayerUpdater.cpp')
0 files changed, 0 insertions, 0 deletions