OSDN Git Service

am d2213597: (-s ours) Cherrypick 025af8 from master. do not merge.
authorRoman Nurik <romannurik@google.com>
Thu, 29 Sep 2011 21:37:04 +0000 (14:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Sep 2011 21:37:04 +0000 (14:37 -0700)
commitb70f3e2d61d31b0871cc0b41923f435515dbf809
treed7d39a38daf099e7d47a905fb8b9b7fa5a76c33e
parentcb9fa491005c8b87feefbd0177d6f0669039b41e
parentd2213597a8f6adeb177d9ddf777112788261e527
am d2213597: (-s ours) Cherrypick 025af8 from  do not merge.

* commit 'd2213597a8f6adeb177d9ddf777112788261e527':
  Cherrypick 025af8 from master. do not merge.