| commit | d591b2413a7b1167dac357a43d78d220a10ec96b | [log] [tgz] |
|---|---|---|
| author | Sreeram Ramachandran <sreeram@google.com> | Wed May 14 00:56:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 00:56:58 2014 +0000 |
| tree | c1ab547b8e32a3549cb418a3cc54d20d0f69e65e | |
| parent | 47b93faa48170661583aecea0ad79b7d1aad8008 [diff] | |
| parent | 4d61e7b5493dc6cafaa3348482521226ddd1e286 [diff] |
am 4d61e7b5: am 59a4a10f: am d57d710f: Merge "Fix build (take two)." * commit '4d61e7b5493dc6cafaa3348482521226ddd1e286': Fix build (take two).