OSDN Git Service

Merge "API fixes for Companion renaming" into oc-dev am: 0a482bda21
authorJeff Sharkey <jsharkey@google.com>
Sat, 29 Apr 2017 19:10:35 +0000 (19:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 29 Apr 2017 19:10:35 +0000 (19:10 +0000)
commit382363873b4ce1a46d524be91cd2642b6f164813
tree15d4fcc3ed099cb13428599c2f851916c6990883
parentb1e16f876e4bd1313b539f2fc2363b317db51c86
parentb5a5033224bd48ef7ba635ece6ae60c58a88bfce
Merge "API fixes for Companion renaming" into oc-dev am: 0a482bda21
am: b5a5033224

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