| commit | a295bdce7f163291bd09a9d776339d6c7cb10ef5 | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Thu Apr 13 15:37:10 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 13 15:37:10 2017 +0000 |
| tree | 2255fcf1147a73bad8bcf95f7d3a2123585fd308 | |
| parent | 1a6ac41f72e3a52621663a34b2ccfdb26624f8c2 [diff] | |
| parent | 7270534ac43cfc30938e09b593965b33502e581e [diff] |
Merge changes I33ac2b52,I5ab8bb11 into oc-dev am: 7270534ac4 -s ours Change-Id: I98536197e3c4096badcc197ffac7b72836ac00dd