OSDN Git Service

Merge commit '88932754ffdcbffb3cb43e03991e5eb598c10458' into nyc-mr1-dev-plus-aosp
authorHugo Benichi <hugobenichi@google.com>
Fri, 27 Jan 2017 07:29:59 +0000 (07:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 Jan 2017 07:29:59 +0000 (07:29 +0000)
commitb7050f527eefab1861846e09a1dfe4667d938af5
tree8ae7674f9e1fdfdc38c6e5f050c908d2cfc582b2
parent90de4acf20382e2f7037c56b558e490505d9aa22
parent6a688ca1add03a888c0e80d358f29455bbdf82c7
Merge commit '88932754ffdcbffb3cb43e03991e5eb598c10458' into nyc-mr1-dev-plus-aosp
am: 6a688ca1ad  -s ours

Change-Id: Icf4cf5e8e95b9de4b313f826a40c1df81c02aa8a