| commit | aff2b79dffbc366746bd1f8db1125b8a6afb6c22 | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Thu Nov 24 02:02:48 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Nov 24 02:02:48 2016 +0000 |
| tree | f4339400ae765f628c1d32abd4ffc9943f11591f | |
| parent | e30d79650b475aefbb5cef576032ac2b5250c2ca [diff] | |
| parent | 57d4540382cb5dbca228fd17edd35b59b6b6b00b [diff] |
resolve merge conflicts of f82aba0 to nyc-mr1-dev-plus-aosp am: 1b1b84e96a -s ours am: 57d4540382 Change-Id: Ic1099c4cff7f7bd93bd9c33e4d9ea987db58713e