commit 682c24e22811d4ee17ae1cd61bf255c3f7e722b7
author Trevor Johns <trevorjohns@google.com> Tue Apr 12 10:13:47 2016 -0700
committer Trevor Johns <trevorjohns@google.com> Tue Apr 19 02:03:59 2016 -0700
tree 14ae11892022b653871ede366b09277254704f5a
parent 65136ac6a4f6fb2423a0768b451782dcd0e960d5

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

docs/html/training/best-permissions-ids.jd

diff --git a/docs/html/training/best-permissions-ids.jd b/docs/html/training/best-permissions-ids.jd
new file mode 100644
index 0000000..e98c095
--- /dev/null
+++ b/docs/html/training/best-permissions-ids.jd
@@ -0,0 +1,9 @@
+page.title=Best Practices for Permissions and Identifiers
+page.trainingcourse=true
+
+@jd:body
+
+
+
+<p>The articles below highlight key guidelines for using permissions
+and identifiers properly in your apps.</p>
\ No newline at end of file