| commit | ca4b0414c4ae387587a6a167406ca3b2bda823e5 | [log] [tgz] |
|---|---|---|
| author | David Gross <dgross@google.com> | Mon Apr 18 12:50:54 2016 -0700 |
| committer | David Gross <dgross@google.com> | Mon Apr 18 12:52:01 2016 -0700 |
| tree | d1d176c163d85964a70a74ac9622dc9fc72c7edf | |
| parent | 356b9dbac912b1918a9137f20c9113aff4ea6b45 [diff] | |
| parent | 17269421eb8e0c74290d23f95cbcb518ddcc3fa9 [diff] |
resolve merge conflicts of 1726942 to nyc-dev-plus-aosp Merge commit '17269421eb8e0c74290d23f95cbcb518ddcc3fa9' into manual_merge_1726942 Change-Id: Ic07ff58a68feb1f48d864c88219665b37a363eca