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.