OSDN Git Service

DO NOT MERGE ANYWHERE
authorBen Lin <linben@google.com>
Tue, 13 Dec 2016 01:46:07 +0000 (01:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Dec 2016 01:46:07 +0000 (01:46 +0000)
commit6f67f964c3fa54292e5896ecb682847614332fb9
tree532690bc812fec9fdfcf553cad758e0d91b12a96
parent19c4422c7ca788945c6565f7e9aa9bdba199ebeb
parent4c80659e99b182492a4719560180079d23c1b338
DO NOT MERGE ANYWHERE
am: 4c80659e99  -s ours

Change-Id: I1d5b79452fcca235e8026cab583040db69aff1e6