OSDN Git Service

Merge changes I1489eaf6,I8ee8f978 into nyc-dev am: 575add3bcf
authorAdam Seaton <aseaton@google.com>
Wed, 21 Sep 2016 17:57:17 +0000 (17:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Sep 2016 17:57:17 +0000 (17:57 +0000)
am: 7706e91d8f

Change-Id: I046a6fd53782e965e39a5a43ab0ea151794a1aeb


Trivial merge