OSDN Git Service

Merge "Re-add the block of text explaining the feature." into oc-mr1-dev am: 3315f38c3f
authorDaniel Nishi <dhnishi@google.com>
Fri, 8 Sep 2017 22:22:32 +0000 (22:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Sep 2017 22:22:32 +0000 (22:22 +0000)
commit56e04db46049f517d8620b6061a017c97c5caa84
tree804e497fe7fec72425436dec28126d4c951230fe
parent4dec4a0730f2bcfae620c34407ef498ab99dde08
parentdf0e716b432c01a66690c62ac11ae0774f2de475
Merge "Re-add the block of text explaining the feature." into oc-mr1-dev am: 3315f38c3f
am: df0e716b43

Change-Id: Ibe767b5bd21ed75ea188a1a6561aa974edd2b449
src/com/android/settings/search/SearchIndexableResources.java
tests/robotests/assets/grandfather_not_implementing_indexable