This undoes the automerger skip which occured in
commit e740c84dc32180214a7fd157105d6c18d30408ee and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
Based on the Google Doc which has gone through tech review. See
first comment for doc stage location.
NOTE: Because the M Preview reference docs are not going to be live on
DAC (they'll be downloadable in a zip archive, I believe), we can't
put in live hyperlinks to new-for-M classes/fields/ methods. Those
have to just be in <code> font with no link. This is consistent across
all the preview docs, and will of course change when these docs are
converted for the MNC release.
bug: 21411602
bug: 21411604
Change-Id: I1163abc1dc884cf27b0e94d266f3979f131db2ab
Per her team's request, I also removed the AI version of the Google
Play Store icon, and replaced it with a high-rez PNG version.
Current version of doc is staged at:
http://asolovay.mtv:9010/distribute/tools/promote/brand.html
(Denise gave me a LGTM via email.)
Bug: 14621461
Change-Id: Id44a0dc73c7ef2f2bde595a1e98b75083d126176
