This undoes the automerger skip which occured in commit e740c84dc32180214a7fd157105d6c18d30408ee and replays it as a standard (NOT -s ours) merge. Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
9 lines
207 B
Plaintext
9 lines
207 B
Plaintext
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> |