am f694d378: (-s ours) resolved conflicts for b161297d to lmp-mr1-ub-dev

Browse Source

* commit 'f694d378955ddac3ee2651080bfa00c5ae39dddc':
  DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

...

This commit is contained in:

Zach Jang

2015-09-21 23:57:04 +00:00

committed by Android Git Automerger

parent 2ad5c0cca4 f694d37895

commit a5842d3e17

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