OSDN Git Service

Merge changes I1eaab5ea,I42928da8 am: b1e3c8aaf4
authorHugo Benichi <hugobenichi@google.com>
Wed, 11 Jan 2017 01:25:09 +0000 (01:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Jan 2017 01:25:09 +0000 (01:25 +0000)
commit994978461f085fc2c07ef0414ff1b696019d8b33
tree47220bfde379a4c7278a1f534a5702f0aecdd9c0
parent9b07cb2fc11d437bd340c84203b5441b05e53468
parent22e7d2ed201af876f169f41010700e5800f5e7ce
Merge changes I1eaab5ea,I42928da8 am: b1e3c8aaf4
am: 22e7d2ed20

Change-Id: I6b0a8e3c2831933199c8cb55ce8c666e8db186e3