tree 2eb488ef7c3b938d7ec27b2078498920882b9179
parent caae5c18ad86cda78d844c0c444a5253afb7514e
parent 42e563a3bc08f1785f379166b6519009c8066fdc
author Jason Sams <jsams@google.com> 1405129313 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405129313 +0000

am 42e563a3: Merge "Remove obsolete WAR."

* commit '42e563a3bc08f1785f379166b6519009c8066fdc':
  Remove obsolete WAR.