OSDN Git Service

am 38e64b25: am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches
authorJohn Reck <jreck@google.com>
Fri, 26 Oct 2012 17:08:17 +0000 (10:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 26 Oct 2012 17:08:17 +0000 (10:08 -0700)
commitf1d6566a2df59e6c1402f95dab3cb51069aa880b
tree74dc73579089e70be69ab6abfffe78d4e93939fe
parentef9cf18c436df3c18989f53c0e2bb14b87ecb487
parent38e64b25801cbec5004cd67ce22ebb6ca822bef1
am 38e64b25: am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches

* commit '38e64b25801cbec5004cd67ce22ebb6ca822bef1':
  Add proxy launcher