| commit | cd9ae7a802f1565d38824a59f3baa22e5b790f65 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Jan 14 12:11:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 14 12:11:50 2015 +0000 |
| tree | c29a002941ea14d0e64ec5b00579c2fb84ad6b4f | |
| parent | 8c35aff73fec6188bdcfeb9d18fda157863fe8dc [diff] | |
| parent | aa566b6ac2fe47a62ad83722d065515ce34cb031 [diff] |
am aa566b6a: 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 'aa566b6ac2fe47a62ad83722d065515ce34cb031': Fix test