OSDN Git Service

Merge changes If5025361,Iabe27cd8 am: 0a649bffcc am: 0773d2cc0d
authorPeter Qiu <zqiu@google.com>
Thu, 26 Jan 2017 23:11:17 +0000 (23:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 23:11:17 +0000 (23:11 +0000)
commite0209c2964deda40b91ef9eb7c47d15966d440ca
tree8791cea96490726671aa13d15b96ada2fc8d0a50
parent245fddfd80d2a8b9a4307b9ef669e98d86f6b0a5
parent26bdc1f273f5632e28bc3ddf83524c5daf866f5b
Merge changes If5025361,Iabe27cd8 am: 0a649bffcc am: 0773d2cc0d
am: 26bdc1f273

Change-Id: I9576f50cc7a922a684efb9ab4e1a57eac766280f