| commit | 5a2a0c27ee4c3d6c7ad03233accf44d6ec34b242 | [log] [tgz] |
|---|---|---|
| author | Jay Shrauner <shrauner@google.com> | Tue Apr 14 15:34:10 2015 -0700 |
| committer | Jay Shrauner <shrauner@google.com> | Tue Apr 14 17:04:08 2015 -0700 |
| tree | e606d1d509200a96a41e4853ab5acc3c9acb002c | |
| parent | e95cbd5c6b790afb0abd601f0809f30daa38ffd6 [diff] |
Merge fixups Remove redundant lines from merge. Don't use old deprecated versions of APIs. Bug: Change-Id: I136136939cacf6400fa7bea3d644eb8ab4dce13e