| commit | bbdfc0c4124d838d16b65ef96cf4285dbe8ae038 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Nov 21 22:18:38 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 21 22:18:38 2013 -0800 |
| tree | 43b238ab9a9e82f1976cd2cc0926a76bfa587b8d | |
| parent | 330b1afc13ae10f9defe34a39a966a9647945b92 [diff] | |
| parent | dd2ac3de625e6c0328a0f70530d8ade0d2151bfc [diff] |
am dd2ac3de: am d966eebf: Merge "Fix build." * commit 'dd2ac3de625e6c0328a0f70530d8ade0d2151bfc': Fix build.