| commit | 56b3152d5438cc6cd9bc3a8a2087a235252ebbc3 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Fri Sep 12 07:21:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 12 07:21:52 2014 +0000 |
| tree | 5adb3eaa0a2c450ce98a99fefe18cc474fec5ef2 | |
| parent | f731049f2ee8fddbdac5f9807e5cd8e8ce86bc56 [diff] | |
| parent | 3969cabf5931059fcc4d36addb5b75ddf76ad1f3 [diff] |
am 790a059b: Merge "If activity is an alias get maxRecents from target" into lmp-dev * commit '790a059b487646bd6aae1cdc866261a57375bb01': If activity is an alias get maxRecents from target