| commit | 5a1428e81ab296df7468ca3e3347d175874e12c4 | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Tue Jun 14 01:38:24 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 14 01:38:24 2016 +0000 |
| tree | 3518b252753cd90ae154992c58375bdceedc3ecd | |
| parent | e639245581d4119c9bda1462bf9efc6f6e30211a [diff] | |
| parent | 744888ed1bf52bfc85868d26252baac6b08fb77f [diff] |
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