OSDN Git Service

Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ... am: 619d6282c3...
authorCalin Juravle <calin@google.com>
Wed, 11 Jan 2017 04:50:28 +0000 (04:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Jan 2017 04:50:28 +0000 (04:50 +0000)
am: 4b1548bd5a

Change-Id: I0aeb97b80a4d5b3eeb18c4a2ac7467c9035f700a


Trivial merge