tree 4cbdd3ffcecf79e81ccaaee650c3c4dd94ee8c67
parent d120065f3e50101db4721a3b2235f07dc1044145
parent 37ba3de333a0bdc6ef2833afbdfb57260a58a1a4
author Colin Cross <ccross@android.com> 1518511301 +0000
committer android-build-merger <android-build-merger@google.com> 1518511301 +0000

Merge "Don't put android.os.Parcelable in framework.aidl" am: 0872f6d5e3 am: 6864210fe2
am: 37ba3de333

Change-Id: Ib8d8277171ede82ea4626b6d2de2fcb9c1a1d307