OSDN Git Service

Merge \"Don\'t try and resolve WRAP_CONTENT too early.\" into nyc-dev
authorRobert Carr <racarr@google.com>
Tue, 21 Jun 2016 23:35:11 +0000 (23:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Jun 2016 23:35:11 +0000 (23:35 +0000)
am: 72ce991692

Change-Id: I277968e2a48ac5647db0f03877ab168afc245a6c


Trivial merge