OSDN Git Service

resolve merge conflicts of cf85fd5 to stage-aosp-master am: 476950d104
authorDimitry Ivanov <dimitry@google.com>
Fri, 15 Jul 2016 23:56:36 +0000 (23:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jul 2016 23:56:36 +0000 (23:56 +0000)
commitb6289b56bb91d90885402471886033b223400253
treed135935e7b8a753bf6ff69cc79128085fc2fbcdf
parentade06ff924c32efc67bf64b64ccc05f8eb316845
parentfa3572cdec641131c6683467606f5e37e384d9cf
resolve merge conflicts of cf85fd5 to stage-aosp-master am: 476950d104
am: fa3572cdec

Change-Id: I90a42442372475d6171ed7ab99be70b392ff8ae8