OSDN Git Service

Merge "Rename PROPERTY_SHOW_CALLBACK_NUMBER" into nyc-mr1-dev am: 4c01673a7b
authorHall Liu <hallliu@google.com>
Wed, 31 Aug 2016 18:38:10 +0000 (18:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 Aug 2016 18:38:10 +0000 (18:38 +0000)
am: 983295d420

Change-Id: Ic66e2f7ca33498eb08b11749d5ff89d0028b0ce7


Trivial merge