| commit | 871500013a60c052475b219be3da10a8b6a9e66b | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Wed Feb 18 02:22:47 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Feb 18 02:22:48 2015 +0000 |
| tree | 6ac38c069c75422407776cebc950f97305895b0a | |
| parent | d7cc04b275ea6d1cec863159327281b0ffbc8120 [diff] | |
| parent | afd2ec9629ac794d6086cf8637f1f1a1c6e01fba [diff] |
Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA" into lmp-mr1-dev-plus-aosp