OSDN Git Service

am 3cd228a2: Merge "Fix Settings Activity" into gb-ub-photos-denali
authorSeth Raphael <magicseth@google.com>
Mon, 7 Apr 2014 04:38:22 +0000 (04:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Apr 2014 04:38:22 +0000 (04:38 +0000)
* commit '3cd228a2cce5ec89ddedd52d88fa5488e0e47bd9':
  Fix Settings Activity


Trivial merge