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

Browse source

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

...

This commit is contained in:

Zach Jang 2015-09-22 00:04:42 +00:00 committed by Android Git Automerger

parent 59f4ff109d a5842d3e17

commit 22e66b3574

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