| commit | b5c02ecbde6c00bcbc65917353ec976430d9ffca | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Dec 14 16:26:34 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 14 16:26:34 2010 -0800 |
| tree | 1d9c459a2f33e6e56933842882ff353325fa7ce5 | |
| parent | 282d39123949ca76ac96af79bdfb29407b723d02 [diff] | |
| parent | 34e826718e99d56da38ecd5ffd8873997722fa92 [diff] |
am 34e82671: resolved conflicts for merge of 76aa8d0a to gingerbread-plus-aosp * commit '34e826718e99d56da38ecd5ffd8873997722fa92': update API version to 9