| commit | aa566b6ac2fe47a62ad83722d065515ce34cb031 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Jan 14 12:04:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 14 12:04:13 2015 +0000 |
| tree | fbe13c0b011cf8e34a8fe80788c903c910de5051 | |
| parent | 5621394507e32d3727e861f727fdf12dfdc7fb90 [diff] | |
| parent | b49c8250f8ef1de9a3bfca2fa0c0363c16a1c68a [diff] |
am b49c8250: am df0e5961: am 78be3f3f: am c5b507e3: am 03a64463: am 430eeb70: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev * commit 'b49c8250f8ef1de9a3bfca2fa0c0363c16a1c68a': Fix test