OSDN Git Service

Merge changes I99f18930,I5f6830d8 into nyc-mr1-dev am: c65dc5529e
authorRob Carr <racarr@google.com>
Thu, 6 Oct 2016 21:20:32 +0000 (21:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Oct 2016 21:20:32 +0000 (21:20 +0000)
am: 2c1a026ee5

Change-Id: I6be8174475b7fce7b6c488cad3a9a2d2a633a24d


Trivial merge