tree aab796c9074b127fdb15f1a7d93100a9c720f07b
parent 44b9a505560866673d1503c4f8ab90f1e871d2d3
parent a2b69f9b7356bc4723aff784216496230f3ef7e1
author Xavier Ducrohet <xav@android.com> 1364509077 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364509077 -0700

am a2b69f9b: am 125cc194: Merge "Add dependency on the 22.0 plugin."

* commit 'a2b69f9b7356bc4723aff784216496230f3ef7e1':
  Add dependency on the 22.0 plugin.