OSDN Git Service

Merge "Merge changes from topic 'sms-files-move-opt-to-base' am: abcc43d86a am: d3861...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Sat, 6 May 2017 02:58:25 +0000 (02:58 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 6 May 2017 02:58:30 +0000 (02:58 +0000)

Trivial merge