am: 6c568e6322
* commit '6c568e632242e99eb255f721edcbec0223f9934d':
Update links for all files under sdk/ that moved to studio/
Change-Id: I2acd1acd6fef98c527ef4dfc0d016bb5cfa296cc
This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
The body of {@code} must not be HTML escaped. This is one of
several changes that fix the source in conjunction with a
doclava fix.
Bug: 25757239
Change-Id: Ib38a0fa2dd2a3d68e467f78a812071e763d7e881
If you're building with Gradle, you no longer include the whole, fully-qualified
name of your project in the URI. Instead, you just end the URI with
res-auto.
Change-Id: Ie7dda8ff8f320951a5bd5d94b80b738cc0d483dc
