| commit | f6c681f7baf16a25002f9ba4c08eb0b120b03cc5 | [log] [tgz] |
|---|---|---|
| author | Guang Zhu <guangzhu@google.com> | Mon Feb 13 18:40:55 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 13 18:40:55 2012 -0800 |
| tree | 67e7e7a75569740717ce43f5fa479e9bc3d66a44 | |
| parent | d26df76f443d9fb587d3327cfa9fd53886ab2515 [diff] | |
| parent | 04568b15b0d1e1e47ef6253834a037f992abd711 [diff] |
am 6ae14555: Merge "fix build" * commit '6ae14555f945a1a0fc04d6acc0131254c9b2c2e2': fix build