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