diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2015-05-18 14:17:51 -0700 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2015-05-18 14:17:51 -0700 |
| commit | 05f803377ebcf2f9c6160fa125948598f0558113 (patch) | |
| tree | 137fd61b6419fa191a1940d53135db2dad7a7f07 /docs/html/develop | |
| parent | 855d5495ffbd9d0e2dfbd22def462247a1a4e61b (diff) | |
| parent | ab6d5376048b72f40d978751d884e74f7ee90d31 (diff) | |
| download | frameworks_base-05f803377ebcf2f9c6160fa125948598f0558113.zip frameworks_base-05f803377ebcf2f9c6160fa125948598f0558113.tar.gz frameworks_base-05f803377ebcf2f9c6160fa125948598f0558113.tar.bz2 | |
resolved conflicts for merge of ab6d5376 to mnc-dev
Change-Id: Ice8e511bffa6a0bc3aec9e44c059a7dfde91d65f
Diffstat (limited to 'docs/html/develop')
| -rw-r--r-- | docs/html/develop/index.jd | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd index d66f8f4..12793eb 100644 --- a/docs/html/develop/index.jd +++ b/docs/html/develop/index.jd @@ -60,7 +60,7 @@ excludeFromSuggestions=true data-maxResults="3"></div> </div></section> -<section class="dac-section dac-section-light"><div class="wrap"> +<section class="dac-section dac-light"><div class="wrap"> <h1 class="dac-section-title">Tools for building apps</h1> <div class="dac-section-subtitle"> Insights into Android's tools and libraries to speed your development. @@ -74,7 +74,7 @@ excludeFromSuggestions=true </ul> </div></section> -<section class="dac-section dac-light"><div class="wrap"> +<section class="dac-section dac-section-light"><div class="wrap"> <h1 class="dac-section-title">Android performance patterns</h1> <div class="dac-section-subtitle"> Everything you need to know about improving your app’s performance. |