OSDN Git Service

Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev
authorTrevor Johns <trevorjohns@google.com>
Mon, 11 Apr 2016 22:08:58 +0000 (22:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 11 Apr 2016 22:08:59 +0000 (22:08 +0000)
commit6edfbfabad1ddbda00e0fcc713672f6e63acdf44
treedef0b98cbcc264f7fa5b96b32a71fd13ba2d2333
parente09b2c16e32cee89d6b5ac29fe5a905b76872179
parentf719c29ea924ce53c6620d18aaaba6d3ef9c06be
Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev