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