| commit | f7a6321a87d4dc1139ed22fa2df415097e73a2d1 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Mar 27 13:40:29 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 27 13:40:29 2013 -0700 |
| tree | 2f0033b266b9b3aead4701e0d5a04b995cc59ffe | |
| parent | 9108fcae9f5b8795ddf93f4a9e69935d697c4e82 [diff] | |
| parent | 4e852f47580a1ec877a1cd9521b4d5a895b57131 [diff] |
am 4e852f47: am 5ea690eb: Merge "Fix build." * commit '4e852f47580a1ec877a1cd9521b4d5a895b57131': Fix build.