| commit | 5a5626acd7195015fb2e7b92cf15fb9a03699b6f | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Tue Oct 18 17:41:52 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 18 17:41:52 2016 +0000 |
| tree | 605dc2c74f719496a2d2cef4c47a02dd1d4a8643 | |
| parent | 04ad536e054b0b013c875dfd68ff709692137d39 [diff] | |
| parent | ccd3468567c68f099609736bb7f8af637cbd1792 [diff] |
resolve merge conflicts of b1301fa to nyc-mr1-dev-plus-aosp am: ccd3468567 Change-Id: I5dac528db07b40bb9e59a090bd7e0016ca6e996a