tree bceb6bcebb7c339a3e66b34c338bb439122ba4be
parent f506b49aa64a9f80c873eeb171997e99df4a1157
parent 96dad7e0a3404d1cb5cb8ec9256bb1254405e07e
author Jon Dormody <jond@google.com> 1512146451 +0000
committer android-build-merger <android-build-merger@google.com> 1512146451 +0000

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

Change-Id: Ib8bbd7fa3dfc9ee5caa3b9f7f2696c7461c3faf3