OSDN Git Service

am cf076416: (-s ours) am 7693a4f0: am 762d8cb0: am b04dcdb5: Merge "Don\'t go into...
authorAngus Kong <shkong@google.com>
Wed, 30 Apr 2014 18:14:43 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:43 +0000 (18:14 +0000)
commitafdcc39a8e987722e468b020ead67b280ec60f1c
tree3804e07840427a842ef1bdc750bffe2239123c26
parent3bfdecd7e890aa2e4767a99983147db2648f50ea
parentcf076416c755d05e133705b882b9cab1437e711d
am cf076416: (-s ours) am 7693a4f0: am 762d8cb0: am b04dcdb5: Merge "Don\'t go into Gcam when it\'s capture intent." into gb-ub-photos-carlsbad

* commit 'cf076416c755d05e133705b882b9cab1437e711d':