tree 162aa76ce1ac88a2a386b0b826c5b850a869c82e
parent db636cae9539b9ddc83f066e1c2bd4c61a98deff
parent 7bc2c81736e916630397e4b27f8e8d37cb3ec389
author Unsuk Jung <unsuk@google.com> 1442279207 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442279207 +0000

am 7bc2c817: am f742ea6d: am bfd0aaba: am b8ad8a1a: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev

* commit '7bc2c81736e916630397e4b27f8e8d37cb3ec389':