| commit | ee955b85ca2ddb1cfb83736a99bab7d3b886646e | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Jan 13 23:19:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 13 23:19:33 2015 +0000 |
| tree | 7c06f1f45d379e13373831ae72471028083edad9 | |
| parent | a4163a070db3f4945db159eb12a205c357dc0a94 [diff] | |
| parent | 26d352cdb019bed0b251348bf60df503ed6020db [diff] |
am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev * commit '26d352cdb019bed0b251348bf60df503ed6020db': Fix test