commit | 44b1a43d823ec3cb93e02df4834b27a75bb30ba5 | [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 | 7db04d1c5c352025b3c80df03dec0d4fa11f1625 | |
parent | 34706a4c81b82319a79a1b5ffa9084ed92a6e284 [diff] | |
parent | 4a6e6991b0df0d1b269193b9e9edbd3bc44ba238 [diff] |
am 4a6e6991: am 5786f5cf: Merge "Fix build." into ics-mr1 * commit '4a6e6991b0df0d1b269193b9e9edbd3bc44ba238':