tree de9f236ed14fd85ac5ac3bfc9688f1a1e55ff937
parent 783f3d4027aa5ec8dd4a731745e619bb07697ebf
parent 4ce9477c1c80eb031c974ba294c8dfc9d7eb3f8b
author TreeHugger Robot <treehugger-gerrit@google.com> 1520007997 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1520007997 +0000

Merge "Correct field type to reflect supertype change." into oc-mr1-jetpack-dev