| commit | 1617ed59df6fa6a0ac7a2168d8acd262a8ac47d7 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon May 21 14:31:13 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 21 14:31:13 2012 -0700 |
| tree | 9ecfd9783b98cf733fb837bb067b86100be742f9 | |
| parent | 08083da011f5dfd9b7dbd45ec0d7016be9422cd5 [diff] | |
| parent | 7a7d4c25c7362c011397219180c9b7e9afa9ce9c [diff] |
am 7a7d4c25: (-s ours) am 4495a871: Fix secondary builds (AOSP, panda) - do not merge * commit '7a7d4c25c7362c011397219180c9b7e9afa9ce9c': Fix secondary builds (AOSP, panda) - do not merge