| commit | 7d07ad1ef2b0edd4c850d366ea77ab0d24cd9db8 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Tue Feb 13 08:41:41 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 13 08:41:41 2018 +0000 |
| tree | 4cbdd3ffcecf79e81ccaaee650c3c4dd94ee8c67 | |
| parent | d120065f3e50101db4721a3b2235f07dc1044145 [diff] | |
| parent | 37ba3de333a0bdc6ef2833afbdfb57260a58a1a4 [diff] |
Merge "Don't put android.os.Parcelable in framework.aidl" am: 0872f6d5e3 am: 6864210fe2 am: 37ba3de333 Change-Id: Ib8d8277171ede82ea4626b6d2de2fcb9c1a1d307