tree 3b7f439f372b2cb3786b489b98d2d9f062dc40ce
parent fdbaca3184832ea83477e48d4c64f5e21301d14a
parent 3df0fc7d8db81cbbab46de71c2f83c12b5eb815c
author Elliott Hughes <enh@google.com> 1405099994 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405099994 +0000

am 3df0fc7d: am 43a4131d: am eadf0519: Merge "Remove more."

* commit '3df0fc7d8db81cbbab46de71c2f83c12b5eb815c':