OSDN Git Service

am c350cd0f: am 97081aa9: am c77839e0: am aee6e41e: Merge "Finish trampoline activity...
authorJorim Jaggi <jjaggi@google.com>
Sat, 12 Sep 2015 02:57:17 +0000 (02:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 12 Sep 2015 02:57:17 +0000 (02:57 +0000)
commit30c5aed420191a00936fb0e7439d9437f03801bb
tree029615cccd7561d75020d80a5d97bbc499f80d6b
parent420965f93eb98fa8afed3907bd92b00ff6a81489
parentc350cd0f87cb0c23e58159b8b75022fed5ce97d8
am c350cd0f: am 97081aa9: am c77839e0: am aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev

* commit 'c350cd0f87cb0c23e58159b8b75022fed5ce97d8':
  Finish trampoline activity for ConfirmDeviceCredential immediately
AndroidManifest.xml