tree 8fd93e9b7651e21bafc20a4eaf26bf66d4d391fa
parent 10fd7cded6c2074101cdb7d9bb8e3724d7c639c5
parent 0ad7db6d434fad746abddf3a5706a3fc623ae55e
author Ying Wang <wangying@google.com> 1414802472 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414802472 +0000

am 0ad7db6d: am 6fc4d5d3: am b4d1e436: Roll 22.txt back to match 21.txt.

* commit '0ad7db6d434fad746abddf3a5706a3fc623ae55e':
  Roll 22.txt back to match 21.txt.