tree 75d47cdcbb7eadf0f96aa8203158ca157cc4a260
parent 95fafca8d5395d414c62a4135eed7f98dd54ab33
parent 47ec74b31c80ff8aa2afd3181d321f15247c2f27
author Andreas Huber <andih@google.com> 1285956227 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285956227 -0700

am d1398db3: Merge "Squashed commit of the following:" into gingerbread

Merge commit 'd1398db35cb2e4d918fc631dda35cacb8540b187' into gingerbread-plus-aosp

* commit 'd1398db35cb2e4d918fc631dda35cacb8540b187':
  Squashed commit of the following: