tree 406976073eb499ae07e769e1bef9eac1693fbe2c
parent a532c3ff8c2101de42281cb71cc411ab1dff64f0
parent 694753465b577509cecba33a90fb7cb6d50f5533
author Amith Yamasani <yamasani@google.com> 1483554216 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1483554218 +0000

Merge "Fix for race in writeToParcel and unparcel"