| commit | 9514ba78d31e794d3cdfbfc5fff47b5cb4f9c262 | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Thu Apr 13 15:50:05 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 13 15:50:05 2017 +0000 |
| tree | a7082c81d26c04072eee268b5aabbf49d964de13 | |
| parent | dfbd46697edec443a2f80347b014b4486b3cf9ac [diff] | |
| parent | a295bdce7f163291bd09a9d776339d6c7cb10ef5 [diff] |
Merge changes I33ac2b52,I5ab8bb11 into oc-dev am: 7270534ac4 -s ours am: a295bdce7f -s ours Change-Id: If82dbc281727166a418cdb0ca905064a62df5d29