| commit | fd91129d5b3c70735a72b54abbeba9342dec49dc | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Nov 21 23:00:24 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 21 23:00:24 2013 -0800 |
| tree | 7f4fd96ef7ad9a57484bef03373a11d511049120 | |
| parent | 06d23c4b298390aea2aebb7426d6e3a2c1d781a7 [diff] | |
| parent | bbdfc0c4124d838d16b65ef96cf4285dbe8ae038 [diff] |
am bbdfc0c4: am dd2ac3de: am d966eebf: Merge "Fix build." * commit 'bbdfc0c4124d838d16b65ef96cf4285dbe8ae038': Fix build.