| commit | 32034b5582d8bd649be29d79caa0dac362336dc6 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Wed Feb 18 11:39:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 18 11:39:14 2015 +0000 |
| tree | 4af9f6c934393c28f447e5ba244e058b32fe1e8f | |
| parent | 6433684417c7cf889b29cc4480488111aaac618a [diff] | |
| parent | f18670b802c85b393995596eee1f171f6d16852b [diff] |
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