tree 3aec0180a616315b7a4ac26de2deb9569946ebe0
parent b3ac0f956512733e2d398cafea8c963dfd0fb58d
parent bcc848c188fad6d5d15631dd24c0f9747c4fc76d
author Xavier Ducrohet <xav@android.com> 1360690485 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360690485 -0800

am bcc848c1: (-s ours) am 71c6b7ae: am 7b7aca60: Move rev for 2 for API 17 and 12 for support. do not merge.

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