| commit | 080ebb5ffd89359f34650222d735dfe356616f69 | [log] [tgz] |
|---|---|---|
| author | Ben Cheng <bccheng@google.com> | Tue Feb 19 11:22:12 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 19 11:22:12 2013 -0800 |
| tree | 12631f820b7cfb19d2ecabf74bc22e17ef2207f4 | |
| parent | ed3fac06d002a88e135c66fd2c65c7f4bac49045 [diff] | |
| parent | d71b9714f746238860f09855febe469b160e32b2 [diff] |
am d71b9714: (-s ours) am 6f2381b8: (-s ours) am b489dba5: (-s ours) Merge "DO NOT MERGE: Fix full_x86-eng build." * commit 'd71b9714f746238860f09855febe469b160e32b2': DO NOT MERGE: Fix full_x86-eng build.