commit | cecb9d810430e475990945355a59b6238c253817 | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Fri Jun 30 21:32:18 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 30 21:32:18 2017 +0000 |
tree | 688bb7e0914e9f2ab0e82af45694560d3af907e5 | |
parent | 552321237e9d3fa905d3ea43a3c55c7f8e677330 [diff] | |
parent | 29f38676eb4141704d339457bdb2399bd4124296 [diff] |
Merge changes Ifa407b84,Iff84c019 into oc-dr1-dev am: 29f38676eb Change-Id: I2024cd2bfc04135a44ab67da2ea52975a266013d