| commit | fc77396ed9d63ef51741bfe2bca4010c2c6b87ae | [log] [tgz] |
|---|---|---|
| author | Arve Hjønnevåg <arve@android.com> | Fri Aug 19 01:30:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 19 01:30:30 2016 +0000 |
| tree | 40c1b614b19cd28f1a6409c219bae77ff802b307 | |
| parent | 0e2718ba5fcf4ebac43d62148b5edac0f203b2f3 [diff] | |
| parent | 504fd0a2e933628c223ec3e3db5a4ddce7ef71ea [diff] |
resolve merge conflicts of 083f4ec to nyc-dev-plus-aosp am: 504fd0a2e9 Change-Id: I7c0bd051ffd81ca419538083dfd3027a1bd716ea