OSDN Git Service

am c12bb313: am 6904a72d: Merge "Use the same taskAffinity for trampoline as Camera...
authorMangesh Ghiware <mghiware@google.com>
Thu, 19 Sep 2013 23:46:15 +0000 (16:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Sep 2013 23:46:15 +0000 (16:46 -0700)
commitfd3e5e687e93fca4d81a9036388d6bf19c875703
tree9795b52d1a02b0ed94942482ceb1addb315366e3
parentd858450ec341a859244e6f8bc46bcd59d5f89a82
parentc12bb31340542493e0083f999fe687acf938f09c
am c12bb313: am 6904a72d: Merge "Use the same taskAffinity for trampoline as Camera" into gb-ub-photos-carlsbad

* commit 'c12bb31340542493e0083f999fe687acf938f09c':
  Use the same taskAffinity for trampoline as Camera