OSDN Git Service

Merge changes If94102c7,I8d51e8e0
authorLorenzo Colitti <lorenzo@google.com>
Tue, 28 Mar 2017 12:33:28 +0000 (12:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Mar 2017 12:33:28 +0000 (12:33 +0000)
commit0a34afb48dd95fdf756b2ae937da95c4bb4f7a33
tree2249d8ff2f537ba4737f55ca78a0c08ffae5defc
parent673de5b39d697cb8b29ea683d2a5b421ac2ba1d1
parent22b829c049042cf2fbad0935d6bde322a0229236
Merge changes If94102c7,I8d51e8e0
am: 22b829c049

Change-Id: I8aa529a05fc40241ec9664775ca0ebd8960098a8