tree 54acc3afbb9a11970223f05b01ad9fc1649d879f
parent 99918e312812608e0e561c77793ff4a7fcc70ecc
parent 4680344bf9d996cc7812446bda0b8479f30e83f1
author Christopher Ferris <cferris@google.com> 1440652227 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440652227 +0000

am 4680344b: (-s ours) am 328a44a4: Fix typo in stp target.

* commit '4680344bf9d996cc7812446bda0b8479f30e83f1':