OSDN Git Service

am c6ba82b5: (-s ours) am ef6b8ea3: (-s ours) am 17f1ff8c: do not merge bug 3370834...
authorJean-Michel Trivi <jmtrivi@google.com>
Wed, 26 Jan 2011 22:17:33 +0000 (14:17 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Jan 2011 22:17:33 +0000 (14:17 -0800)
commit986cd9a00130eadeab3fe95866f227c8cbd70ed5
tree2f95df5fffce520ee4f8c93c51328cc6af010ea1
parentf2faac71fd54ef16807b94d19e46d7ad99b001a7
parentc6ba82b58e7a7207f19190a8b814ce8a131c109e
am c6ba82b5: (-s ours) am ef6b8ea3: (-s ours) am 17f1ff8c: do not merge bug 3370834 Cherrypick from master CL 79894

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