tree 3a2dc36bc6652f9592fa077aba710bfc41767511
parent 9c37f4a07009849ad85fb5d224c2472eb52cf610
parent c06d309115b6af2d4f9bd232acea2d285822290a
author Unsuk Jung <unsuk@google.com> 1442861848 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442861848 +0000

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

* commit 'c06d309115b6af2d4f9bd232acea2d285822290a':