OSDN Git Service

am e21f3764: (-s ours) am 75c66458: am 8325c3a8: Backporting I57c58c4083bd59f45095c18...
authorDan Morrill <morrildl@google.com>
Tue, 3 May 2011 20:42:02 +0000 (13:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 3 May 2011 20:42:02 +0000 (13:42 -0700)
commit4daf16cd59408253ab4580a0301a11f18e808d77
tree14c59d32706b97f3b9c58ea9d6643f1484c84c91
parent7b741e2c8fb4215d903c76473ce8c32210bdf4bd
parent78419fd0167db7beb8f2d855a781cfe427f22211
am e21f3764: (-s ours) am 75c66458: am 8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.

* commit 'e21f3764343ba3b077c6be3cad568ab9ecea85a7':
  Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.