OSDN Git Service

am 886130bc: (-s ours) Two patches.
authorAndy McFadden <fadden@android.com>
Tue, 9 Nov 2010 02:13:32 +0000 (18:13 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Nov 2010 02:13:32 +0000 (18:13 -0800)
commite9503ef8c460f4818062ecc80a9e0b4f8c6745b8
tree60afaceda12b421087e6024c6609da505db188b3
parent1fe3432661f96bf57b1e3bd91c3c01bd7564e6ae
parent886130bc7ff992940e152636f57072e58c91aa2e
am 886130bc: (-s ours) Two patches.

* commit '886130bc7ff992940e152636f57072e58c91aa2e':
  Two patches.