commit | 99e51452ceb70d1e456adb9bb57d11c9a129e373 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Tue Jan 29 08:23:38 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 29 08:23:38 2013 -0800 |
tree | 3271222b09eabcb0c82eb072c76b7a3d8b455a87 | |
parent | 4d1352f29f92127a503eee7504174055a47ede3c [diff] | |
parent | 77059769ca8f5c20015f521ca8c17e810959183e [diff] |
am 77059769: am 756dafc3: resolved conflicts for merge of b376b2cc to jb-mr1-aah-dev # Via Jean-Baptiste Queru (2) and Android Git Automerger (1) * commit '77059769ca8f5c20015f521ca8c17e810959183e': Generate blob list for tilapia.