OSDN Git Service

Merge \\"resolve merge conflicts of 4931fb2 to nyc-mr1-dev-plus-aosp\\" into nyc...
authorCraig Donner <cdonner@google.com>
Tue, 14 Jun 2016 04:04:07 +0000 (04:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 14 Jun 2016 04:04:07 +0000 (04:04 +0000)
commitc0571e0fc942a7d979c19c4f735c9629bc9b1fd9
tree5740474c9ea179818f3cbf190aaef326b47e09a6
parentad7ef77a308d4b5984ce493ff4465c32a5b3a848
parentc334ca140de527e39dd3cbff05565759a8368e81
Merge \\"resolve merge conflicts of 4931fb2 to nyc-mr1-dev-plus-aosp\\" into nyc-dev-plus-aosp am: 3756a8350b
am: c334ca140d

Change-Id: I5326d3444cc47bc1476f53f5a184351b9652cfa0