summaryrefslogtreecommitdiffstats
path: root/healthd/BatteryMonitor.cpp
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2014-04-07 22:12:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-07 22:12:07 +0000
commit4854a36e2a26afb248304fde9738fa6009c14190 (patch)
treeedd96a9e7fb83dfd9a8843ffa5011a02bf811c53 /healthd/BatteryMonitor.cpp
parent3b9e3a10f94c5d4d1f6d9b7ca4054400cf3d2c85 (diff)
parent1f87d3ab8c384d03d1496c63f7faad15bd5eeba9 (diff)
downloadsystem_core-4854a36e2a26afb248304fde9738fa6009c14190.zip
system_core-4854a36e2a26afb248304fde9738fa6009c14190.tar.gz
system_core-4854a36e2a26afb248304fde9738fa6009c14190.tar.bz2
am 1f87d3ab: am 83fd6375: am 31631861: Merge "Add guards to prevent typedefs when C++11 is available."
* commit '1f87d3ab8c384d03d1496c63f7faad15bd5eeba9': Add guards to prevent typedefs when C++11 is available.
Diffstat (limited to 'healthd/BatteryMonitor.cpp')
0 files changed, 0 insertions, 0 deletions