OSDN Git Service

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


Trivial merge