| commit | 6adbc2c98255cd063b44572c898f21477e7946f2 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Sun Oct 09 21:54:57 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Oct 09 21:54:57 2016 +0000 |
| tree | 603d90593492fb898a8f76824192aaa03630c614 | |
| parent | 8570f7efd1a1d58d5265962bd9ad1042500b3ac6 [diff] | |
| parent | e708954c8ce858a143684111eeca84f435775fa5 [diff] |
resolve merge conflicts of 09ab9a6 to nyc-mr1-dev-plus-aosp am: e708954c8c Change-Id: I06343fdf7d7173e689d136bacb382fde3e3873b9