OSDN Git Service

Merge commit 'a19056c35d16ddb5a6c1d3343729701b8939f1e1' into nyc-mr1-dev-plus-aosp
authorHugo Benichi <hugobenichi@google.com>
Fri, 27 Jan 2017 07:28:06 +0000 (07:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 Jan 2017 07:28:06 +0000 (07:28 +0000)
am: 53095bb5bd  -s ours

Change-Id: Ie2f8c1e18acf57238fe4816812562ecd1644cf51


Trivial merge