OSDN Git Service

am 4e7cb0d6: (-s ours) am dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if Camera...
authorzafir <zafir@google.com>
Thu, 27 Aug 2015 11:19:01 +0000 (11:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:19:01 +0000 (11:19 +0000)
commit43a659aad9f6a11b6b00037dd87cbdfde9beb3dc
tree3c0461c5c282480975dc6250f9835ccdde1adbea
parent558a6f2a0950a5f4f5c43daa01d21afa50f277bc
parent4e7cb0d6d04b1b8d1d9309c5e1012b32c76478ef
am 4e7cb0d6: (-s ours) am dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

* commit '4e7cb0d6d04b1b8d1d9309c5e1012b32c76478ef':