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)
commit22ac87f20cd3217953f923f6fa8d229bf23bdbfe
treebd439f70967d73d0ac731778f796c00acc1dc300
parente5d03623e7f0704663013f3326355d26c542af14
parenta6ac60bdcf3045f08afd8fe00d63c8b4616a3c63
Merge "Merge changes from topic 'sms-files-move-opt-to-base' am: abcc43d86a am: d38615b846 am: 63a79edbe0  -s ours" into oc-dev-plus-aosp