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)
am: 6a688ca1ad  -s ours

Change-Id: Icf4cf5e8e95b9de4b313f826a40c1df81c02aa8a


Trivial merge