OSDN Git Service

Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev am...
authorFan Zhang <zhfan@google.com>
Tue, 25 Jul 2017 21:53:25 +0000 (21:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Jul 2017 21:53:25 +0000 (21:53 +0000)
commit00d306465cc765a043ce5f644dd1a99c15855164
tree93ef6de86ed657cab54e32ad61998118353159be
parent7fdb865c1b2267fb6ba7b4f6971c1a7a086fcc18
parent3bc97152d1fa52118f957e83225e965c6cb136e9
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev am: 6ef56e43ee am: 2f84a358d9
am: 3bc97152d1

Change-Id: Iea6491534c7d43a97456ab2e83eae5e32c747c80