OSDN Git Service

Merge changes from topic 'am-8f2774833da54dc1bf4ce7062adbf934' into nyc-mr2-dev-plus...
authorAdam Seaton <aseaton@google.com>
Tue, 17 Jan 2017 23:46:08 +0000 (23:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Jan 2017 23:46:08 +0000 (23:46 +0000)
am: 9f58ec2f1c

Change-Id: I3284def1320104dd8c38f0a23f43112f576a2518


Trivial merge