| commit | 5aa4ba3776e3017a686acc1e6f7acfd04f272d61 | [log] [tgz] |
|---|---|---|
| author | Jakub Pawlowski <jpawlowski@google.com> | Thu Aug 11 15:53:06 2016 -0700 |
| committer | Jakub Pawlowski <jpawlowski@google.com> | Thu Aug 11 15:53:06 2016 -0700 |
| tree | cdd798d9cf1386e3bfaf255fa501dd542168f336 | |
| parent | c97c9dbd962326bdb39b126ed2d84ed861e803c2 [diff] | |
| parent | 5671277d2a84cdc4e99eb37b318ae921d4f22cdb [diff] |
resolve merge conflicts of 5671277 to stage-aosp-master Change-Id: I71e3bd497dbdc0b3f297ad311620aa77bf7225ac