tree 78308db8a01c6297e385aeb46bee8b1dacc7fc7d
parent 385969235051b2d8d9f4b1e5d2d6d207ab6a8898
parent 71c6b7ae8516c2d5b4c54fbf978888d3ebbc7100
author Xavier Ducrohet <xav@android.com> 1360690352 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360690352 -0800

am 71c6b7ae: am 7b7aca60: Move rev for 2 for API 17 and 12 for support. do not merge.

# Via Android Git Automerger (1) and Xavier Ducrohet (1)
* commit '71c6b7ae8516c2d5b4c54fbf978888d3ebbc7100':
  Move rev for 2 for API 17 and 12 for support. do not merge.