| commit | 969f0708d9832cd1691e3100fd0c342b56ec2e78 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Feb 04 20:45:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 04 20:45:18 2015 +0000 |
| tree | 4570227c00d745e4ed0dd749f6e98adfb01d31b2 | |
| parent | d52356aa5e82c7c5db61672bbe8d0f44861f3e59 [diff] | |
| parent | 4c49b1fb774d59d3a6e8a6bb5a4549828504c5af [diff] |
am 4c49b1fb: am b2d7ca7c: am fd2c1307: Merge "Fix build." * commit '4c49b1fb774d59d3a6e8a6bb5a4549828504c5af': Fix build.