| commit | bf133cf2dd3fd3a32f98f8e68045cd0c591fcd93 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 12 08:02:08 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 12 08:02:08 2012 -0700 |
| tree | 032f71c11ef50fb60031e1f1d7703c720ee4e941 | |
| parent | 547975cf50510a94caf0c1d247e8d3192b5c0d85 [diff] | |
| parent | 401a65b7846fb87991142d9caa4a6176f75bbe27 [diff] |
am 401a65b7: resolved conflicts for merge of 45cb1b0a to jb-dev-plus-aosp * commit '401a65b7846fb87991142d9caa4a6176f75bbe27': Fix Eclipse classpath file for ICS.