OSDN Git Service

resolve merge conflicts of cb6e72f to nyc-mr1-dev-plus-aosp
authorDimitry Ivanov <dimitry@google.com>
Fri, 26 Aug 2016 23:27:38 +0000 (23:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 23:27:38 +0000 (23:27 +0000)
commit6789d86d235ab8558457e1ec0a29599d4debae3c
tree0cceab95c4d7711cc3ac82d364a6ab39da9c7e90
parent129cf4ae622900559070d48c220f652b905b4d3a
parente1703b4582ae3adb8b15bc7fab275caa56d7eb10
resolve merge conflicts of cb6e72f to nyc-mr1-dev-plus-aosp
am: e1703b4582

Change-Id: I96bbd5a036b0d77658294792c730e4e8c3c0ecdd