OSDN Git Service

Merge changes I1eaab5ea,I42928da8 am: b1e3c8aaf4 am: 22e7d2ed20
authorHugo Benichi <hugobenichi@google.com>
Wed, 11 Jan 2017 01:34:23 +0000 (01:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Jan 2017 01:34:23 +0000 (01:34 +0000)
am: 994978461f

Change-Id: Id4b45a161e8b2d6b077bc27bd7ab797a308fea29


Trivial merge