summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorShawn Willden <swillden@google.com>2015-02-18 11:39:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-18 11:39:14 +0000
commit32034b5582d8bd649be29d79caa0dac362336dc6 (patch)
tree4af9f6c934393c28f447e5ba244e058b32fe1e8f /modules
parent6433684417c7cf889b29cc4480488111aaac618a (diff)
parentf18670b802c85b393995596eee1f171f6d16852b (diff)
downloadhardware_libhardware-32034b5582d8bd649be29d79caa0dac362336dc6.zip
hardware_libhardware-32034b5582d8bd649be29d79caa0dac362336dc6.tar.gz
hardware_libhardware-32034b5582d8bd649be29d79caa0dac362336dc6.tar.bz2
am f18670b8: am 892ae44c: Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA"
* commit 'f18670b802c85b393995596eee1f171f6d16852b': Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA
Diffstat (limited to 'modules')
0 files changed, 0 insertions, 0 deletions