OSDN Git Service

am ef6b8ea3: (-s ours) am 17f1ff8c: do not merge bug 3370834 Cherrypick from master...
authorJean-Michel Trivi <jmtrivi@google.com>
Wed, 26 Jan 2011 22:15:05 +0000 (14:15 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Jan 2011 22:15:05 +0000 (14:15 -0800)
commitc6ba82b58e7a7207f19190a8b814ce8a131c109e
tree4b990c0a1d44b77612ccaca0739ab2d88ddc9289
parent61f357948648ff45d35ec79725db4e1b12c268dc
parentef6b8ea3f664254958491f48fbe38c502d1129df
am ef6b8ea3: (-s ours) am 17f1ff8c: do not merge bug 3370834 Cherrypick from master CL 79894

* commit 'ef6b8ea3f664254958491f48fbe38c502d1129df':
  do not merge bug 3370834 Cherrypick from master CL 79894