| commit | f5927be940976d937017c15afb411f8f53371e56 | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <scroggo@google.com> | Tue Mar 14 21:29:15 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Mar 14 21:29:15 2017 +0000 |
| tree | 50a8317d7981e7fa4e6efba548e4fc3b7f069fd4 | |
| parent | 79973d8448f46214ba88b68eb69e85dcbf2d0c01 [diff] | |
| parent | 33f878e41041d8b5be91a98ed55f9657f2683e8d [diff] |
resolve merge conflicts of c1786d9 to nyc-mr2-dev-plus-aosp am: 33f878e410 -s ours Change-Id: I04c5449803f55d3e26bbc979d998db0802560f07