tree b0d6ca40bde4f2dbf8a69bd982bf053825434ab4
parent da12f30fa5c7cb6e2cde866dcf586079c7f638fe
parent b640b49e4451dacb5ce181df86b7c662ee50e693
author Unsuk Jung <unsuk@google.com> 1442419398 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442419398 +0000

am b640b49e: am 9feaaaf4: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75

* commit 'b640b49e4451dacb5ce181df86b7c662ee50e693':