Merge \"Merge \\\\\"Correct parentActivity example in Activity Element docs.\\\\\" into mnc-io-docs am: 893413e50c am: ce2e9d8716 am: 3f1741a19c am: 0ea3ffd6c1\" into nyc-mr1-dev-plus-aosp

am: 744888ed1b

Change-Id: I6e879f62f035c2ec4874fe3fe5bdce7f3c7a5b20
This commit is contained in:
Aurimas Liutikas
2016-06-14 01:38:24 +00:00
committed by android-build-merger

Diff Content Not Available