| commit | e4a3d9865ee9a0555e06cf2496f509f168746607 | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Tue Oct 11 00:31:43 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 11 00:31:43 2016 +0000 |
| tree | 8714cb99edad9ec9da53c0641471001613d971bb | |
| parent | 9add6d9e26f7f73a52324df60812f1450b382483 [diff] | |
| parent | 14295772c3c055e4b9b25b8b8e9c39a2b78f9a18 [diff] |
resolve merge conflicts of 253b129 to nyc-mr1-dev-plus-aosp am: 14295772c3 -s ours Change-Id: Ifab7935bd76cdebc1fe3704e7045f45200dbdb67