| commit | 5acddcef222f57d84e493042ca12ae46fb1d9ef2 | [log] [tgz] |
|---|---|---|
| author | Jason Chen <jasonchen@google.com> | Wed Sep 01 19:39:00 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 01 19:39:00 2010 -0700 |
| tree | e14be6b4f3fdc8c21545bc2373e31a6262776222 | |
| parent | 9dc2e75e2720a8d0a5d7b87be53300eac021a3f3 [diff] | |
| parent | 9fadca71e455a6c849311083677351d4dc64b792 [diff] |
am 9fadca71: (-s ours) am b766ab83: DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml Merge commit '9fadca71e455a6c849311083677351d4dc64b792' * commit '9fadca71e455a6c849311083677351d4dc64b792': DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml