| commit | 5eafe7b801e143e31298c9ba564baee7139b7049 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Mar 13 17:25:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 17:25:20 2014 +0000 |
| tree | 761dd58056ceefe6b8ae1f6708e7074cda7d4901 | |
| parent | a0ed71a5b9602d7364323c2084ce09e6db8844fd [diff] | |
| parent | 48d24dc307f850add4e7314590f696721e8a42c1 [diff] |
am 48d24dc3: Merge "Fix build." * commit '48d24dc307f850add4e7314590f696721e8a42c1': Fix build.