OSDN Git Service

am 8519dcd5: (-s ours) DO NOT MERGE : Cherry-pick of change I9942e8e4 from master
authorNicolas Roard <nicolas@android.com>
Fri, 4 Mar 2011 09:21:43 +0000 (01:21 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Mar 2011 09:21:43 +0000 (01:21 -0800)
* commit '8519dcd53eb4325b8d2d76c030d0af4503472df7':
  DO NOT MERGE : Cherry-pick of change I9942e8e4 from master


Trivial merge