tree 98a2c0271abd833d57aa60f1947521d8d44849c1
parent 728ca235b5a8ec7953981bd69d6e9a33bf9e433a
parent ce7f1e6601647dde5d1145d5bac1f7aea64e1aef
author Jon Dormody <jond@google.com> 1512144855 +0000
committer android-build-merger <android-build-merger@google.com> 1512144855 +0000

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

Change-Id: If7798db1aea1f1d6cdb42a7d25509c814a31f6ca