[automerger skipped] Merge "Move app setting link from Entity header to pref controller" into pi-dev am: e3319d0449

Browse Source

am: afb17b6ed1  -s ours

Change-Id: I9d5f00c14ec5092f4f28d5dfc8d9064020d5de8b

...

This commit is contained in:

Fan Zhang

2018-05-16 14:21:57 -07:00

committed by android-build-merger

parent 16db9e14d7 afb17b6ed1

commit 21d1652158

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

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available