OSDN Git Service

Merge changes I19e53731,I12ec6445 into nyc-mr1-dev-plus-aosp
authorJason Monk <jmonk@google.com>
Tue, 26 Jul 2016 15:06:49 +0000 (15:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Jul 2016 15:06:49 +0000 (15:06 +0000)
commitca2b877833917be7292c4f2cebe7c432c8b83fbb
treef160c70fd70fe7497a26d1146bdffdb70fc25e96
parent41494547201643f2a687db8f2331cbb710f903be
parentb43041a8e9fff4eee9204c67566ed5db31c63449
Merge changes I19e53731,I12ec6445 into nyc-mr1-dev-plus-aosp
am: b43041a8e9

Change-Id: I1e57cf7cd157790f199449bf19cb6288c70c7226