OSDN Git Service

Merge "Add string for set data warning." into nyc-mr1-dev
authorFan Zhang <zhfan@google.com>
Tue, 13 Sep 2016 23:22:11 +0000 (23:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 23:22:11 +0000 (23:22 +0000)
am: c88805713d

Change-Id: I7f1efdeb01c4cbe2c74290411b658c6efc997c8f


Trivial merge