OSDN Git Service

Merge changes I69c1931b,I6b08f52d am: 1a5da2b533
authorPeter Qiu <zqiu@google.com>
Wed, 26 Oct 2016 22:43:23 +0000 (22:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Oct 2016 22:43:23 +0000 (22:43 +0000)
commitf300e2f8ff3cae4ce2e4dae6bb91eb6856d8958c
tree0a65cf2ec4f2f7271a1e52cbafb02e15fa21c80a
parent90e40ee8434351ddde09fcc486957f9f318e2d87
parentfe4f473fb8e006d559686080ca4fac6e6af5f6bf
Merge changes I69c1931b,I6b08f52d am: 1a5da2b533
am: fe4f473fb8

Change-Id: I54e73a4e4f336fc8d4fc5eae55d138a46aee9626