tree 6d55a010fe25826f4cb2c77c751ebb08354681f2
parent 5915392068cc21a6f35851518710741c54b77060
parent e9605bddbb097835a9091707b41733a6c842aabf
author Tomasz Mikolajewski <mtomasz@google.com> 1480556299 +0000
committer android-build-merger <android-build-merger@google.com> 1480556299 +0000

resolve merge conflicts of 14afdcf to nougat-cts-dev am: d640e59d1d am: dbb1abc9b0 am: bdc926e557 am: 36b94fbfb5 am: 6d1881384f
am: e9605bddbb

Change-Id: I3f05526cf9a822de31c0c5a743880f30066d61a8