OSDN Git Service

am fc66fa53: (-s ours) am 9a9724c3: am a2c6d5bf: (-s ours) do not merge: cherry-picke...
authorNick Kralevich <nnk@google.com>
Thu, 10 Jun 2010 18:58:59 +0000 (11:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 10 Jun 2010 18:58:59 +0000 (11:58 -0700)
commit829818cdfdbc5a312ddb7883bab484ba4ed4fb7a
treec83664aa8f9dbcf25da267601d0d5575ed56123c
parent1337f4f975cf7a058f92cfa56ae89dfb215aebe0
parenteab454e14af1b37057a848c840bf3243a28cb58b
am fc66fa53: (-s ours) am 9a9724c3: am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch