tree adb64c650885008a1b21eaedbeb3b9fc778f44aa
parent 33b8084320550bdfe6216a0f3af72332f9a6dab7
parent 96756e99e2f7e8d3e75aa405951b1538116c1c7a
author Matt Casey <mrcasey@google.com> 1386283072 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386283072 +0000

am 96756e99: (-s ours) am 2c18bc28: am 77ece7b1: Merge "Extend assist context to foreground services"

* commit '96756e99e2f7e8d3e75aa405951b1538116c1c7a':