tree 6d3e8c4dd7b0291a9f199a79ad46de10f4ac24f3
parent 02b7a08635dd0ae96e9d094e061d5f244fe3e64e
parent 09fbd3949bf1a6e0bf8861c3d5b75d0470c4025e
author Xavier Ducrohet <xav@google.com> 1410308747 +0000
committer android-build-merger <android-build-merger@google.com> 1410308747 +0000

Move wrapper prop to 2.1
automerge: 09fbd39  -s ours

* commit '09fbd3949bf1a6e0bf8861c3d5b75d0470c4025e':
  Move wrapper prop to 2.1