tree 7848801fbb6cb3683e427cbf9600bef7257bd88b
parent fb839ce59aeaf0bc2774091c3b7004a93f224d05
parent 1c7c4b2f14af3d218e714e8e11e47c8b8e1a6010
author Jon Dormody <jond@google.com> 1512143616 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1512143616 +0000

Merge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs Bug: 1766768" into oc-dev