OSDN Git Service

Merge "Patrially revert 4ec026930bfbbb5d8923f359c8." into nyc-dev
authorNarayan Kamath <narayan@google.com>
Tue, 10 May 2016 15:03:33 +0000 (15:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 May 2016 15:03:33 +0000 (15:03 +0000)
am: 9bfc33f8ae

* commit '9bfc33f8aeea4d958fa2315cd8b6e6234464c8ab':
  Patrially revert 4ec026930bfbbb5d8923f359c8.

Change-Id: Ieb05a88326f0e6f11a74f1d82e11391a5af9c962


Trivial merge