| commit | d283131129b2f4ec7e80c6a1062c4d73e63ef741 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Fri Sep 23 12:05:18 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 23 12:05:18 2011 -0700 |
| tree | 46d61cac1e220b7e2b7dcd53efcf43fe9ca02b4e | |
| parent | 82193e9b8ccca5c4d5021bee57f8f4607b9a97fc [diff] | |
| parent | 5d9df469ba3662afefa78447c323cdfccb40b60b [diff] |
am 5d9df469: (-s ours) CherryPick 15fa2c from master. do not merge. * commit '5d9df469ba3662afefa78447c323cdfccb40b60b': CherryPick 15fa2c from master. do not merge.