682c24e228
This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
14 lines
318 B
YAML
14 lines
318 B
YAML
toc:
|
|
- title: Overview
|
|
path: /ndk/samples/index.html
|
|
|
|
- title: Walkthroughs
|
|
path: /ndk/samples/walkthroughs.html
|
|
section:
|
|
- title: hello-jni
|
|
path: /ndk/samples/sample_hellojni.html
|
|
- title: native-activity
|
|
path: /ndk/samples/sample_na.html
|
|
- title: Teapot
|
|
path: /ndk/samples/sample_teapot.html
|