| commit | 6b08afdd760c7e2a0a3cbbb5d6cd2da57e4234a1 | [log] [tgz] |
|---|---|---|
| author | Satoshi Kataoka <satok@google.com> | Thu Oct 03 12:03:07 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 03 12:03:07 2013 -0700 |
| tree | 1de4fe69ceaa40fa12a4e6d2dc559d48c8b199b3 | |
| parent | ac09a2fb114ef7821f66429cceb6e7bb32a2f678 [diff] | |
| parent | 8048c0ee03e5bce68fe533fa907fbd40f5f6ce37 [diff] |
am 8048c0ee: am 1017fb21: am 8099342d: am be4d38e6: Merge "Fix test breakage" * commit '8048c0ee03e5bce68fe533fa907fbd40f5f6ce37':