commit | aa4b1d8ba9d5e317b67638b764d92d17fb810aa0 | [log] [tgz] |
---|---|---|
author | Xavier Ducrohet <xav@android.com> | Mon Jul 11 12:43:15 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 11 12:43:15 2011 -0700 |
tree | 77623c86fb434d14b42a3d6efe10d12dec49d991 | |
parent | 4821d3bdf8ce35408c6a10fe45c39a5e701ea8e2 [diff] | |
parent | d292d2a03134eaca8b51b6313610b4b78de53c83 [diff] |
am d292d2a0: Merge 36a3a392 from mr1. * commit 'd292d2a03134eaca8b51b6313610b4b78de53c83': Merge 36a3a392 from mr1.