OSDN Git Service

am 2031adff: (-s ours) am f8576979: Merge "Also consider task intent when trimming...
authorWale Ogunwale <ogunwale@google.com>
Thu, 27 Aug 2015 09:49:38 +0000 (09:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:49:38 +0000 (09:49 +0000)
* commit '2031adffb8936dcb8d8f9c8b4668cd2ae50d44b8':


Trivial merge