tree a51a20b89cbad2a97a49324fd8a221c33738663b
parent 5d4bd6d50c2486d8d21a4eff45b294ba7d343c4b
parent 2e255f876a977559a6e00e866f4f23f6020d152d
author Paul Soulos <psoulos@google.com> 1413176420 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413176420 +0000

am 2e255f87: am de3dc40d: am 97b1e2d6: Fixes a renaming bug (renamed instantiation without refactoring uses)

* commit '2e255f876a977559a6e00e866f4f23f6020d152d':
  Fixes a renaming bug (renamed instantiation without refactoring uses)