OSDN Git Service

am b715a7c4: Do not merge: Cherry-pick change I21555e92 from master
authorDerek Sollenberger <djsollen@google.com>
Thu, 3 Mar 2011 02:26:16 +0000 (18:26 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Mar 2011 02:26:16 +0000 (18:26 -0800)
commit1a2d40c0fc6710c8ccefb3779b3f9c04c6e43ef5
tree04ff7bf42acf62fcad5f8e63aa55e27f15b76657
parent959e9dbc6321a6dafa3f419e67459e50ea29bc14
parentb715a7c48aa637ebc2832775ea04567c915f6296
am b715a7c4: Do not merge: Cherry-pick change I21555e92 from master

* commit 'b715a7c48aa637ebc2832775ea04567c915f6296':
  Do not merge: Cherry-pick change I21555e92 from master