OSDN Git Service

am 34264dab: Merge "Remove extra parent mode from array, and make PhotoModule scope...
authorAlan Newberger <alann@google.com>
Tue, 19 Aug 2014 01:54:31 +0000 (01:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 19 Aug 2014 01:54:31 +0000 (01:54 +0000)
* commit '34264dab0b30bfcc3af38c3211d5a9cf9f9932e6':
  Remove extra parent mode from array, and make PhotoModule scope string public


Trivial merge