Merge changes I6620c996,I094c2cb0 into oc-mr1-dev

Browse source

am: 27e56723de  -s ours

Change-Id: I9f18136d725664b8b732e0f4eb5d83822fda350c

...

This commit is contained in:

Mark Salyzyn 2017-09-27 15:08:50 +00:00 • committed by android-build-merger

parent 7b736efe13 27e56723de

commit 7b034eb0a1

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available