| commit | 667597e7cf7914de5c6d3448dbf01666f087768a | [log] [tgz] |
|---|---|---|
| author | Ta-wei Yen <twyen@google.com> | Wed Oct 12 19:03:21 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 12 19:03:21 2016 +0000 |
| tree | 36f800750a43de70254d57ed3f9ff420f94e226d | |
| parent | 1f446590f5fe867be2b5cb3ed82ec4e4076a527f [diff] | |
| parent | 864052d53f3269e1fdb333f002c8d7d298c91eb2 [diff] |
resolve merge conflicts of 3d43d7f to nyc-mr1-dev-plus-aosp am: 864052d53f Change-Id: I996c67aff6ca5901e3422b09a4e2faf1d33c5eb6