| commit | 37ba3de333a0bdc6ef2833afbdfb57260a58a1a4 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Tue Feb 13 07:51:59 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 13 07:51:59 2018 +0000 |
| tree | 0898f89771e11081f9e4a82a406a56fcba86ff4e | |
| parent | 7532fc8bb98a56adea7b9d07da26b33a3ec9f76f [diff] | |
| parent | 6864210fe2011bd0e40ea1808dfed5dcd33c64a5 [diff] |
Merge "Don't put android.os.Parcelable in framework.aidl" am: 0872f6d5e3 am: 6864210fe2 Change-Id: I17a5277ece615569670f5f8ea9c2ed42fb473a52