| 682c24e22811d4ee17ae1cd61bf255c3f7e722b7 |
|
12-Apr-2016 |
Trevor Johns <trevorjohns@google.com> |
Resolve merge conflicts of a5060ee to nyc-dev
This undoes the automerger skip which occured in
commit e740c84dc32180214a7fd157105d6c18d30408ee and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
/frameworks/base/docs/html/distribute/stories/stories_toc.cs
|
| 0aba9daacda098268087c7e41c907a8c04dec1f7 |
|
10-Dec-2014 |
smain@google.com <smain@google.com> |
fix distribute nav styles. they were not highlighted correctly.
Change-Id: I53f727353d263eb8caa62261751be3adcdc18273
/frameworks/base/docs/html/distribute/stories/stories_toc.cs
|
| 3506ac87c09c0748d92ef594c94365a5d7b07262 |
|
21-Feb-2014 |
Dirk Dougherty <ddougherty@google.com> |
Doc change: Updated content for distribute.
Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
/frameworks/base/docs/html/distribute/stories/stories_toc.cs
|