OSDN Git Service

am 66c00be2: (-s ours) am d8606879: am ad98a63f: am aae09fb1: Merge "Differentiate...
authorztenghui <ztenghui@google.com>
Wed, 30 Apr 2014 18:14:57 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:57 +0000 (18:14 +0000)
commitc7b41337dd441b9e677045212b23b4e5605b7cc0
tree3804e07840427a842ef1bdc750bffe2239123c26
parent188a9f50ec85a3ab0467d2f909211fe7a2bb5804
parent66c00be2d759877fa81b850a40df18d3e50145aa
am 66c00be2: (-s ours) am d8606879: am ad98a63f: am aae09fb1: Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad

* commit '66c00be2d759877fa81b850a40df18d3e50145aa':