| commit | 5a8176d4856909958b8ac95f39fcf71e96ffd5ce | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Fri Oct 01 17:07:09 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 01 17:07:09 2010 -0700 |
| tree | 1f0d342cbed2ea50622e9a4e941d45ace6afca65 | |
| parent | cbe29a0ccd247f2344991eb198ddd8eb3c9935f3 [diff] | |
| parent | 7502ebeb17370dd79696806545d61cfa0d9cbd10 [diff] |
am 007d5b2c: am fd57416c: Fix build. Merge commit '007d5b2cf6af32dfe96c0c04988d090b872afb01' * commit '007d5b2cf6af32dfe96c0c04988d090b872afb01': Fix build.