tree e606d1d509200a96a41e4853ab5acc3c9acb002c
parent e95cbd5c6b790afb0abd601f0809f30daa38ffd6
author Jay Shrauner <shrauner@google.com> 1429050850 -0700
committer Jay Shrauner <shrauner@google.com> 1429056248 -0700

Merge fixups

Remove redundant lines from merge. Don't use old deprecated versions of APIs.

Bug:
Change-Id: I136136939cacf6400fa7bea3d644eb8ab4dce13e