| commit | bf9473b4309ccb0dfb7bdd1e97c842943731be3d | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Fri Feb 24 16:29:44 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 24 16:29:44 2012 -0800 |
| tree | 0ecbd0769f339854cca023a8cf56e75f0ba5aa63 | |
| parent | de3f69a237ed8b058d75c8bb695a10737f9de125 [diff] | |
| parent | 2f171c6e50518a750f2e43d6bf138a0d1a5e3100 [diff] |
am 4a6e6991: am 5786f5cf: Merge "Fix build." into ics-mr1 * commit '4a6e6991b0df0d1b269193b9e9edbd3bc44ba238':