OSDN Git Service

am d292d2a0: Merge 36a3a392 from mr1.
authorXavier Ducrohet <xav@android.com>
Mon, 11 Jul 2011 19:43:15 +0000 (12:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Jul 2011 19:43:15 +0000 (12:43 -0700)
commitaa4b1d8ba9d5e317b67638b764d92d17fb810aa0
tree77623c86fb434d14b42a3d6efe10d12dec49d991
parent4821d3bdf8ce35408c6a10fe45c39a5e701ea8e2
parentd292d2a03134eaca8b51b6313610b4b78de53c83
am d292d2a0: Merge 36a3a392 from mr1.

* commit 'd292d2a03134eaca8b51b6313610b4b78de53c83':
  Merge 36a3a392 from mr1.