OSDN Git Service

Merge changes I40064d3e,I50594ad8 into nyc-mr2-dev am: 7eaec196b7
authorPaul Stewart <pstew@google.com>
Tue, 20 Dec 2016 05:13:54 +0000 (05:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Dec 2016 05:13:54 +0000 (05:13 +0000)
commit9aae1f3cf0f69f6330cccba1f92487529e99e403
treeed81f2011b733703bfa0737bf41807f54d3074bf
parented41d26b92001b74e6c24ab74ad0c84c4a33a4cb
parentcf03183241194d32a28b0c3c74b8d02723bfd7e7
Merge changes I40064d3e,I50594ad8 into nyc-mr2-dev am: 7eaec196b7
am: cf03183241

Change-Id: Iea8951ca4ddc1b69ca57da6b9cbaf1bcdd860bcc