OSDN Git Service

Merge "Partial revert of 261725fdb2962271c222a049fcdf57bbdc8363c7" into nyc-dev
authorChris Craik <ccraik@google.com>
Thu, 10 Mar 2016 00:26:18 +0000 (00:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 10 Mar 2016 00:26:20 +0000 (00:26 +0000)

Trivial merge