diff options
| author | Robert Ly <robertly@google.com> | 2011-06-14 11:26:39 -0700 |
|---|---|---|
| committer | Robert Ly <robertly@google.com> | 2011-06-14 11:26:39 -0700 |
| commit | 1431fd98b1a9b69a8b9a03d07bc408aefe30c28e (patch) | |
| tree | f60fcb5842b87f01fbbb07b9b1b298572acb6315 | |
| parent | 1d3173c3dc93bb4f2efc5b059fec8e7577b3258a (diff) | |
| download | frameworks_base-1431fd98b1a9b69a8b9a03d07bc408aefe30c28e.zip frameworks_base-1431fd98b1a9b69a8b9a03d07bc408aefe30c28e.tar.gz frameworks_base-1431fd98b1a9b69a8b9a03d07bc408aefe30c28e.tar.bz2 | |
cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Conflicts:
docs/html/sdk/sdk_toc.cs
Change-Id: I03be3486734960c4c691d4d2abe6b17c5114b1a9
| -rw-r--r-- | docs/html/sdk/sdk_toc.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/html/sdk/sdk_toc.cs b/docs/html/sdk/sdk_toc.cs index 5b90551..d02c13d 100644 --- a/docs/html/sdk/sdk_toc.cs +++ b/docs/html/sdk/sdk_toc.cs @@ -175,7 +175,8 @@ class="new">new!</span></li> <span style="display:none" class="zh-TW"></span> </h2> <ul> - <li><a href="<?cs var:toroot ?>sdk/ndk/index.html">Android NDK, r5b</a> + <li><a href="<?cs var:toroot ?>sdk/ndk/index.html">Android NDK, r5c <span + class="new">new!</span></a> </li> <li><a href="<?cs var:toroot ?>sdk/ndk/overview.html">What is the NDK?</a></li> </ul> |