tree 37852e1db0243345c381cf40d089394aa798318a
parent 836cfa6ba243f82b04910a604c8880e22d374583
parent eabb5621dd67a159500c7a35eaa2f7999004c004
author Chris Craik <ccraik@google.com> 1491326705 +0000
committer android-build-merger <android-build-merger@google.com> 1491326705 +0000

Merge "Revert "Switch libplatformproto to sharedlib"" into oc-dev
am: eabb5621dd

Change-Id: Ie8e941bc49639d0841d6955c268069d95d450e38