OSDN Git Service

am e0279d33: resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Fri, 15 Jun 2012 00:09:01 +0000 (17:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 Jun 2012 00:09:01 +0000 (17:09 -0700)
commita3e74b9e2af780a6395d89e10121fb9d72852e2c
tree371f07dcdde04701d587cb9751214b6d5b1d2b9f
parent103c5b04d678212a25d52301d0b4062b93f9e945
parente0279d33974a095b12abfe33f3e0be84b5e7b7d0
am e0279d33: resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp

* commit 'e0279d33974a095b12abfe33f3e0be84b5e7b7d0':
  Gallery2: Check privative effects