OSDN Git Service

Merge changes If5025361,Iabe27cd8 am: 0a649bffcc am: 0773d2cc0d am: 26bdc1f273
authorPeter Qiu <zqiu@google.com>
Fri, 27 Jan 2017 00:13:28 +0000 (00:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 Jan 2017 00:13:28 +0000 (00:13 +0000)
am: e0209c2964

Change-Id: I358ec7c3c5587a3bf692ae5d99be43ea378f7a67


Trivial merge