commit | 77059769ca8f5c20015f521ca8c17e810959183e | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Tue Jan 29 08:21:45 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 29 08:21:45 2013 -0800 |
tree | 886b41e69c0e5da017b1f7a210648aa9c45b5f21 | |
parent | 36812cec765785f80d23be5495ab499104975e4f [diff] | |
parent | 756dafc33b350fc8673f6dfe4a10172299d1a42d [diff] |
am 756dafc3: resolved conflicts for merge of b376b2cc to jb-mr1-aah-dev # Via Jean-Baptiste Queru * commit '756dafc33b350fc8673f6dfe4a10172299d1a42d': Generate blob list for tilapia.