Trevor Johns
682c24e228
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
2016-04-19 02:03:59 -07:00
Scott Kennedy
f7c06ddbfc
Merge "docs: Typos and other fixes" into jb-mr1-dev
2013-04-03 16:16:35 +00:00
Roman Nurik
fb80c9e0f8
docs: Add PageTransformer to animations training class
...
Change-Id: I01f7e5b1fa078d9219edf190e5e8444192cc55f1
2013-01-17 15:37:20 -08:00
Scott Kennedy
a8396686a2
docs: Typos and other fixes
...
External 42844
External 42778
External 42768
External 42730
External 42720
External 42678
External 39381
Change-Id: Ia9d54ce87dc266650d0620fd3adc63137322e20b
2013-01-16 10:07:13 -08:00
Robert Ly
3f53212602
docs: animations au class
...
Change-Id: I776ccdf44014fe38dd55dedfed8730306d2a2cea
2012-10-25 13:26:32 -07:00
