OSDN Git Service

Merge changes Ide94af72,Ie2c94439 into nyc-mr1-dev am: efa21a9924
authorWale Ogunwale <ogunwale@google.com>
Thu, 11 Aug 2016 21:19:45 +0000 (21:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 Aug 2016 21:19:45 +0000 (21:19 +0000)
am: 70d32b3d22

Change-Id: I7b235a555e585900e7949f79757d7555e277270d


Trivial merge