OSDN Git Service

Merge changes I9b4e55c2,I429562a0 into nyc-mr1-dev am: 41a3acc55a
authorHugo Benichi <hugobenichi@google.com>
Wed, 29 Jun 2016 00:30:17 +0000 (00:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 29 Jun 2016 00:30:17 +0000 (00:30 +0000)
am: ca9a575a79

Change-Id: I948403eb8ff92b2de87d8ce402921b3ede7e0b82


Trivial merge