OSDN Git Service

Merge "API fixes for Companion renaming" into oc-dev
authorJeff Sharkey <jsharkey@google.com>
Sat, 29 Apr 2017 17:22:04 +0000 (17:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 29 Apr 2017 17:22:04 +0000 (17:22 +0000)
commitb5a5033224bd48ef7ba635ece6ae60c58a88bfce
treebaf6d1c2ba0e8b1137efbd4a5b5308d6e0331a01
parent2aaa8a6ad5ab9f36075c642bd41bfaf5f43fa0a7
parent0a482bda218138c6f2c03da6a374f16b8f92061d
Merge "API fixes for Companion renaming" into oc-dev
am: 0a482bda21

Change-Id: Ieae01b365a956afb48531a16adf3051e1624255d
api/current.txt
api/system-current.txt
api/test-current.txt