tree a5b01e7714e08c28da6d945bea0296d013cbaccf
parent 2503b4726d7f067c4f47a298de5069392c15be5f
parent d364339a9d697787280f9e2ce36aa21f760e7be9
author Jason Chen <jasonchen@google.com> 1283395140 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283395140 -0700

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