| commit | 9da42f05bfc125460d6228fd3d7882db420df78e | [log] [tgz] |
|---|---|---|
| author | Alain Vongsouvanh <alainv@google.com> | Fri Jan 06 10:47:48 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 06 10:47:48 2017 +0000 |
| tree | f1a11abf9c7b952e8753c96ac2b51c862965770f | |
| parent | 46848cada3a8fc8888329d567497422ecfb2aa46 [diff] | |
| parent | 5549258eea588b82fe8c0690062d2c543f7bf3a1 [diff] |
resolve merge conflicts of 2fda2ce15958 to nyc-mr1-dev-plus-aosp am: 5549258eea Change-Id: Ic77c99e37c9e5ff019adf5693ea40d9e5d80c562