OSDN Git Service

Merge "resolve merge conflicts of 20ebbb3 to nyc-dev" into nyc-dev
authorPavel Zhamaitsiak <pavelz@google.com>
Tue, 5 Apr 2016 04:29:11 +0000 (04:29 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 5 Apr 2016 04:29:12 +0000 (04:29 +0000)
commitf8565cd3f30c60d8343dae3ca8c8bca18c5b451a
tree943f0d7f10d613eb5be2600c71e40daff9b291a0
parent39ca5c22808a8d7bd82c2fdbeaf4e389da450857
parentce13079ab3b49e315765a41d96ffab5fa6fb1b67
Merge "resolve merge conflicts of 20ebbb3 to nyc-dev" into nyc-dev