OSDN Git Service

am 1451df28: (-s ours) am 027e3b7f: Merge "Fix check for caller being the active...
authorShirish Kalele <kalele@google.com>
Thu, 27 Aug 2015 10:10:50 +0000 (10:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:10:50 +0000 (10:10 +0000)
* commit '1451df28162978ac0609690357d8f0d9e1635c16':


Trivial merge