Merge changes from topic 'move-default-prop-v2' into oc-dev

Browse Source

am: c6b07ec095  -s ours

Change-Id: Icf6feeb41709606a8144b2e50aebe7a327e6e183

...

This commit is contained in:

Hung-ying Tyan 2017-06-14 02:29:29 +00:00 committed by android-build-merger

parent 1366c5c120 c6b07ec095

commit e908e98895

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 Not Available