| commit | 430eeb70a70bea7b79a7298b9f883aed645637c2 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Jan 13 23:40:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 13 23:40:58 2015 +0000 |
| tree | 82c8c38b930977b5134f8b45c75452539088b284 | |
| parent | 869d25245ecb5af27fc6cc123897b7665b254816 [diff] | |
| parent | 46d82f0ba33dd35fe3307a65d50e9544fdc8247e [diff] |
am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev * commit '46d82f0ba33dd35fe3307a65d50e9544fdc8247e': Fix test