| commit | 766a91e79652e2dac045ab1d05200ad36563f0db | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Nov 12 07:49:34 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 12 07:49:34 2012 -0800 |
| tree | df361a0944af272adc29c88ba60faa9be8b0c43a | |
| parent | dbb317545abe03044078b756d7bdbc30a6285582 [diff] | |
| parent | c761eeaa8a2a6d872c54d7674d6f3be1504be4bb [diff] |
am c761eeaa: (-s ours) am 51f84bac: Only build phantasm in this branch - do not merge * commit 'c761eeaa8a2a6d872c54d7674d6f3be1504be4bb': Only build phantasm in this branch - do not merge