OSDN Git Service

Merge changes I2ce11db5,Idba8278b am: dd3f863499 am: 198134666b
authorColin Cross <ccross@android.com>
Tue, 4 Oct 2016 21:23:07 +0000 (21:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Oct 2016 21:23:07 +0000 (21:23 +0000)
commit7c765a2ba1f7e0e5934b6694a78633c570797c88
treefd71c734b49e156f014f6c4ad7bf06a00a6d308e
parent92234c57ad085f6fd137ef3047f6d6c3bdf7a2d0
parentd45e51b8156c9b464ba0bc3ab9cc427463a957aa
Merge changes I2ce11db5,Idba8278b am: dd3f863499 am: 198134666b
am: d45e51b815  -s ours

Change-Id: I4f7e6dbcd4a1ab14ed0c6e7cb056a6a94175831e