summaryrefslogtreecommitdiff
path: root/libs/input/PointerController.cpp
diff options
context:
space:
mode:
author James Hawkins <jhawkins@google.com> 2016-06-04 00:08:14 +0000
committer android-build-merger <android-build-merger@google.com> 2016-06-04 00:08:14 +0000
commitc4b5996d105208dd404e9789c74f77a29da8c9c2 (patch)
treeabbb8215747dd27c5cf4b058f88bdcf1f6c352a0 /libs/input/PointerController.cpp
parent4a6c8aeebf69f4b0764bd709439f0e0dbecc8d40 (diff)
parent80267f2b08f6814ab23d1436a2a37a1b032374e0 (diff)
Merge "Merge "am/UserController: Log system uptime at two \'boot complete\' markers." into nyc-dev am: eb47d6205f am: 440e3c7dfe" into nyc-mr1-dev-plus-aosp
am: 80267f2b08 * commit '80267f2b08f6814ab23d1436a2a37a1b032374e0': am/UserController: Log system uptime at two 'boot complete' markers. Change-Id: I6fc9be4e3a02a8f32032d20134ca92a50e20a8f2
Diffstat (limited to 'libs/input/PointerController.cpp')
0 files changed, 0 insertions, 0 deletions