OSDN Git Service

Merge "Re-add the block of text explaining the feature." into oc-mr1-dev
authorDaniel Nishi <dhnishi@google.com>
Fri, 8 Sep 2017 21:39:16 +0000 (21:39 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 8 Sep 2017 21:39:16 +0000 (21:39 +0000)
commit3315f38c3f46168c2542b0040fedde8db91937e7
tree4467347dd9e7e36fba9194a25bd6d3f01b7ef5e3
parent40e284b1962f8776006bc05f854659147fa02f2a
parent59c8d77c8c5ee62fabd962db2555b5324caa51df
Merge "Re-add the block of text explaining the feature." into oc-mr1-dev