OSDN Git Service

am 01084cdb: (-s ours) am 38ddd91e: am 7da0c4cd: am 24d94d61: Merge "Workaround to...
authorAngus Kong <shkong@google.com>
Wed, 30 Apr 2014 18:14:48 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:48 +0000 (18:14 +0000)
commit2266187e18cb2899c57cfcd98a102c9aa111f895
tree3804e07840427a842ef1bdc750bffe2239123c26
parent15ae035bdac8a472ac23d7aa8facc38d6f309903
parent01084cdb183aad8506c88feb8f745eb1e63f99f7
am 01084cdb: (-s ours) am 38ddd91e: am 7da0c4cd: am 24d94d61: Merge "Workaround to prevent the data focus callback." into gb-ub-photos-carlsbad

* commit '01084cdb183aad8506c88feb8f745eb1e63f99f7':