OSDN Git Service

Merge "resolve merge conflicts of c19c1c2 to nyc-dev-plus-aosp" into nyc-dev-plus...
authorCalin Juravle <calin@google.com>
Thu, 17 Mar 2016 17:24:21 +0000 (17:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 Mar 2016 17:24:22 +0000 (17:24 +0000)
commitbce19ce7dff918c12604614a5e27d02b78e877a4
treed03b2c72fad9a848095ec1734803e22880c6f95e
parentd344ab34612208e466e78b1162214d5ec1f95019
parent5b7de5976db625a853a0f82d94a6873eed15a174
Merge "resolve merge conflicts of c19c1c2 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp