tree b821423f15784e9ea1469e7c688d4d9f3da47b44
parent 29345d8d21ebe2dfd39a09bda0205740a994de47
parent b591da942e159588c70687dfe3e792feedc8f3b4
author Dianne Hackborn <hackbod@google.com> 1412297224 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412297224 +0000

am b591da94: Merge "Maybe fix issue #17449495: Nakasi is pretty laggy/slow to do anything" into lmp-dev

* commit 'b591da942e159588c70687dfe3e792feedc8f3b4':
  Maybe fix issue #17449495: Nakasi is pretty laggy/slow to do anything