| commit | 4d61e7b5493dc6cafaa3348482521226ddd1e286 | [log] [tgz] |
|---|---|---|
| author | Sreeram Ramachandran <sreeram@google.com> | Wed May 14 00:51:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 00:51:49 2014 +0000 |
| tree | db74b30ed412e9dfa4f6fcf9be3cad2493f52b42 | |
| parent | 9d58ec78b33296325982e1b87edcb54d0fb7a012 [diff] | |
| parent | 59a4a10f097a0bdd8d5e9aa52ce1139ccabf82b1 [diff] |
am 59a4a10f: am d57d710f: Merge "Fix build (take two)." * commit '59a4a10f097a0bdd8d5e9aa52ce1139ccabf82b1': Fix build (take two).