| commit | f18670b802c85b393995596eee1f171f6d16852b | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Wed Feb 18 06:03:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 18 06:03:10 2015 +0000 |
| tree | 6ac38c069c75422407776cebc950f97305895b0a | |
| parent | 871500013a60c052475b219be3da10a8b6a9e66b [diff] | |
| parent | 892ae44c5f805f6ac64e6e756964c79998411742 [diff] |
am 892ae44c: Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA" * commit '892ae44c5f805f6ac64e6e756964c79998411742': Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA