tree ae2365c157f1762d014f883537447c3d7637a4bf
parent cd1b1ee39fbeaf7d95089c183b549b0853206ffd
parent 7d1adede2fbea8f4c0ad92214bee16395498dd07
author Craig Mautner <cmautner@google.com> 1422986672 +0000
committer android-build-merger <android-build-merger@google.com> 1422986672 +0000

am 240e8743: Merge "[ActivityManager] Set appropriate relation of task to home"
automerge: 7d1aded

* commit '7d1adede2fbea8f4c0ad92214bee16395498dd07':
  [ActivityManager] Set appropriate relation of task to home