OSDN Git Service

Merge "resolve merge conflicts of 4931fb2 to nyc-mr1-dev-plus-aosp" into nyc-mr1...
authorCraig Donner <cdonner@google.com>
Tue, 14 Jun 2016 03:55:26 +0000 (03:55 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 14 Jun 2016 03:55:27 +0000 (03:55 +0000)
commit6fdf8966c7afcb5c7bf04788952933aa606a7b2b
treea47ebec6266473ad67f5bb17437d4d8e51c3dc36
parent66e84e18c00bab4ab938b56a5e069926f5604160
parent30b71b10302bdfcd6c0679c03cf21d17a715317b
Merge "resolve merge conflicts of 4931fb2 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp