2 Commits

Author	SHA1	Message	Date
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
Ricardo Cervera	7383f1708e	docs: Simplify and update the Signing page. Bug: 16296405 ... Change-Id: Id74525b00efdbb21e41895a4e0351b2450125a90	2014-07-30 13:43:10 -07:00