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