summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Nick Vaccaro <nvaccaro@google.com> 2016-01-26 20:15:15 +0000
committer android-build-merger <android-build-merger@google.com> 2016-01-26 20:15:15 +0000
commita0a1599d8b8d8da38a47a939864d6f80bf6b9a09 (patch)
treef43222f1a96c060272647d76c69e3ab2dc5f1828 /libs/gui/ConsumerBase.cpp
parent6df23e81f762ec7bdf3d575582ad51aaef5172cf (diff)
parentca19b6a4d347dae318157988134471f9d40e2052 (diff)
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev
am: ca19b6a4d3 -s ours * commit 'ca19b6a4d347dae318157988134471f9d40e2052': [DO NOT MERGE ANYWHERE] Fix bodysensor permission
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
0 files changed, 0 insertions, 0 deletions