| commit | 8adb3ef04c1bf28fd45d2eb93e2236e66a1aedd4 | [log] [tgz] |
|---|---|---|
| author | Shih-wei Liao <sliao@google.com> | Wed Apr 11 11:39:23 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 11 11:39:23 2012 -0700 |
| tree | 31200bf752fe0216c193689cbf238e6ea07bb2de | |
| parent | b3ef520b54c28cef3fffba37282637667e64da1e [diff] | |
| parent | b4e331bd50dff797df2c9d00eb6bd6a3c3c01f58 [diff] |
am b4e331bd: Merge "Fix 004-annotation because we missed the linking." into ics-mr1-plus-art * commit 'b4e331bd50dff797df2c9d00eb6bd6a3c3c01f58': Fix 004-annotation because we missed the linking.