am 1b77f3f7: resolved conflicts for merge of d648f557 to lmp-dev-plus-aosp

Browse Source

* commit '1b77f3f7417598414694eb29e17a4873a38a1d18':
  Remove non-standard prctl constants from <sys/prctl.h>.

...

This commit is contained in:

Elliott Hughes 2014-07-18 00:42:52 +00:00 committed by Android Git Automerger

parent 3d96532171 1b77f3f741

commit a9fdbb819f

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